Index: head/contrib/apr/CHANGES
===================================================================
--- head/contrib/apr/CHANGES	(revision 361677)
+++ head/contrib/apr/CHANGES	(revision 361678)
@@ -1,200 +1,82 @@
                                                      -*- coding: utf-8 -*-
-Changes for APR 1.5.2
+Changes for APR 1.7.0
 
-  *) SECURITY: CVE-2015-1829 (cve.mitre.org)
-     APR applications using APR named pipe support on Windows can be 
-     vulnerable to a pipe squatting attack from a local process; the extent
-     of the vulnerability, when present, depends on the application.
-     Initial analysis and report was provided by John Hernandez of Casaba 
-     Security via HP SSRT Security Alert.  [Yann Ylavic]
+  *) apr_dir_read: [Unix] Dropped the preference of the dirread_r() flavor
+     for dirread(), because the former is both deprecated and unneeded.
+     [Yann Ylavic, William Rowe]
 
-  *) apr_atomic: Fix errors when building on Visual Studio 2013 while
-     maintaining the ability to build on Visual Studio 6 with Windows
-     Server 2003 R2 SDK. PR 57191. [Gregg Smith]
+  *) apr_file_info: [Win32 only] Treat only "name surrogate" reparse points
+     as symlinks, and not other reparse tag types. PR47630
+     [Oleg Liatte <olegliatte gmail.com>]
 
-  *) Switch to generic atomics for early/unpatched Solaris 10 not exporting
-     some atomic functions.  PR 55418.  [Yann Ylavic]
+  *) Test %ld vs. %lld to avoid compiler emits using APR_OFF_T_FMT, in the
+     case of apparently equivilant long and long long types. [William Rowe] 
 
-  *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files
-     per process.  PR 57677.  [Jeff Trawick]
+  *) Recognize APPLE predefined macros as equivilant to DARWIN. [Jim Jagielski]
 
-  *) apr_escape: Correctly calculate the size of the returned string in
-     apr_escape_path and set the correct return value in case we actually
-     escape the string. [<aduryagin gmail.com>] PR 57230.
+  *) Signals: Allow handling of SIGUSR2 in apr_signal_thread. [Yann Ylavic]
 
-  *) pollcb on Windows: Handle calls with no file/socket descriptors.
-     Follow up to PR 49882. [Jeff Trawick, Yann Ylavic]
+  *) Atomics: Support for 64bit ints. [Jim Jagielski]
 
-  *) apr_poll(cb): fix error paths returned values and leaks.  [Yann Ylavic]
+  *) Add the apr_encode_* API that implements RFC4648 and RFC7515
+     compliant BASE64, BASE64URL, BASE32, BASE32HEX and BASE16
+     encode/decode functions. [Graham Leggett]
 
-  *) apr_thread_cond_*wait() on BeOS: Fix broken logic.  PR 45800.
-     [Jochen Voss (no e-mail)]
+  *) rand: Use arc4random_buf() on BSD platforms and getrandom() on Linux,
+     when available. [Christian Weisgerber <naddy openbsd.org, Yann Ylavic]
 
-  *) apr_skiplist: Optimize the number of allocations by reusing pooled or
-     malloc()ed nodes for the lifetime of the skiplist.  [Yann Ylavic]
+  *) Add apr_sockaddr_zone_set, apr_sockaddr_zone_set to set and retrieve
+     the zone for link-local IPv6 addresses.  [Joe Orton]
 
-  *) apr_skiplist: Fix possible multiple-free() on the same value in
-     apr_skiplist_remove_all().  [Yann Ylavic]
+  *) apr_sockaddr_equal: Compare link-local IPv6 addresses with different
+     zones as not equal.  [Joe Orton]
 
-  *) apr_pollset: On z/OS, threadsafe apr_pollset_poll() may return
-     "EDC8102I Operation would block" under load.
-     [Pat Odonnell <patod us.ibm.com>]
+  *) apr_sockaddr_ip_getbuf, apr_sockaddr_ip_get: Append "%zone" for
+     IPv6 link-local addresses.  [Joe Orton]
 
-  *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not 
-     returning IPv4 addresses if any IPv6 addresses were returned. 
-     [Eric Covener]
+  *) Locks: add a --disable-timedlocks config option in case users
+     encounter more platforms where it fails [Nick Kew].
 
-  *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and
-     later.  [Jeff Trawick]
+  *) apr_allocator, apr_pools: Add apr_allocator_page_size() and
+     apr_allocator_min_order_set() to respectively get the (system's) page size
+     in use and set the minimum allocation size for an allocator (expressed in
+     2^order pages).  [Yann Ylavic]
 
-  *) apr_global_mutex/apr_proc_mutex: Resolve failures with the 
-     POSIX sem implementation in environments which receive signals.
-     [Jeff Trawick]
+  *) locks: provide portable implementations of timedlock()s for
+     posix-sems, sysv-sems and pthreads for those platforms that
+     lack native versions (eg: OSX/macOS). [Jim Jagielski]
 
-  *) apr_skiplist: Fix potential corruption of skiplists leading to 
-     results or crashes. [Takashi Sato <takashi tks st>, Eric Covener]
-     PR 56654.
+  *) locks: Introduce apr_{thread,proc,global}_mutex_timedlock().
+     [Yann Ylavic]
 
-  *) Improve platform detection by updating config.guess and config.sub.
-     [Rainer Jung]
+Changes for APR 1.6.x and later:
 
-Changes for APR 1.5.1
+  *) http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/CHANGES?view=markup
 
-  *) apr_os_proc_mutex_get() on Unix:  Avoid segfault for cross-
-     process pthread mutexes.  [Yann Ylavic <ylavic.dev gmail.com>]
+Changes for APR 1.5.x and later:
 
-  *) When using shmget-based shared memory, the ID used for ftok is
-     now an APR hash of the filename instead of the constant '1'.
-     We do this to help avoid collisions. PR 53996 [Jim Jagielski]
-
-  *) apr_socket_atreadeof(): Fix breakage on OS X. [Jim Jagielski]
-
-  *) Fix POSIX shared memory (shm_open) use for named shared memory.
-     Includes adding '--enable-posix-shm' to force POSIX shm if
-     available, and OS X compatibility. PR 55928.
-     [Jozef Hatala <jh-asf skrt org>, Jim Jagielski]
-
-  *) Fix race condition when calling apr_dir_make_recursive from
-     multiple threads on Windows.
-     [Bert Huijben]
-
-  *) Fix apr_escape.c compilation errors on EBCDIC platforms.
-     [Eric Covener]
-
-  *) FreeBSD 10: Correct a regression in 1.5.0 which affected non-
-     blocking sockets in some applications, including httpd.  [Jeff
-     Trawick]
-
-  *) Windows cmake build: Fix incorrect installation of some .pdb
-     files.  Fix incorrect use of some logic intended for Windows 9x,
-     including legacy filesystem interfaces and dynamic loading of
-     some Windows APIs.  [Jeff Trawick]
-
-  *) apr_skiplist: Add compatibility with C++ applications.
-     [Jeff Trawick]
-
-  *) Correct a regression in 1.5.0 which affected out-of-tree
-     builds on Unix.  [Rainer Jung]
-
-  *) Improve platform detection by updating config.guess and config.sub.
-     [Rainer Jung]
-
-Changes for APR 1.5.0
-
-  *) Fix Linux kernel version check to recognize more versions,
-     including versions 3.10 and later.  PR 55690.  [Joe Orton,
-     Arfrever Frehtes Taifersar Arahesis <arfrever.fta gmail.com>]
-
-  *) Add apr_sockaddr_is_wildcard() to check if a socket address
-     refers to the wildcard address for the protocol family (e.g.,
-     0.0.0.0/INADDR_ANY for IPv4).  [Jeff Trawick]
-
-  *) apr_file_dup2() on Windows: Fix debug RTL assertion when 
-     attempting to _commit(stdout) or _commit(stderr).  [Mike Rumph
-     <mike.rumph oracle.com>]
-
-  *) apr_socket_connect() on Windows: Handle WSAEISCONN.  PR 48736.
-     [<inoue ariel-networks.com>, Jeff Trawick]
-
-  *) z/OS: threadsafe apr_pollset_poll support for sockets [Greg Ames]
-
-  *) Windows:  Don't obtain a mutex for buffered file I/O unless the
-     file was opened with the APR_FOPEN_XTHREAD flag.  [Ivan Zhakov
-     <ivan visualsvn.com>]
-
-  *) Windows:  Create named shared memory segments under the "Local"
-     namespace if the caller is unprivileged, fixing an inability of
-     unprivileged callers to use apr_shm_create() with named shared
-     memory segments under recent Windows.  As before, shared memory
-     segments are created under the "Global" namespace for privileged
-     callers.  Add apr_shm_create_ex() and apr_shm_attach_ex(), which
-     provide the ability to override the normal namespace selection.
-     [Jeff Trawick]
-
-  *) Update compile settings for MINT OS.  PR 47181. [Alan Hourihane
-     <alanh fairlite.co.uk>]
-
-  *) Files and pipes on Windows:  Don't create an unused pollset when
-     files and pipes are opened.  [Mladen Turk]
-
-  *) apr_socket_timeout_set() on Windows: If the socket was in a non-
-     blocking state before, disable that setting so that timeouts work.
-     [Jeff Trawick]
-
-  *) File info APIs: Fix calculation of atime and mtime on AIX. PR 51146.
-     [Ruediger Pluem]
-
-  *) Add the apr_escape interface. [Graham Leggett]
-
-  *) Cygwin build fixes.  PRs 51016 and 55586.  [Carlo Bramini
-     <carlo.bramix libero.it>] 
-
-  *) Add apr_skiplist family. [Jim Jagielski]
-
-  *) Add experimental cmake-based build system for Windows.  Refer to 
-     README.cmake for more information.  [Jeff Trawick, Tom Donovan]
-
-  *) Add the apr_table_getm() call, which transparently handles the
-     merging of keys with multiple values. [Graham Leggett]
-
-  *) Add apr_hash_this_key(), apr_hash_this_key_len(), and 
-     apr_hash_this_val() for easier access to those attributes from
-     a hash iterator.  [Hyrum K. Wright <hyrum_wright mail.utexas.edu>]
-
-  *) MinGW/MSYS:  Support shared builds of APR, other general improvements
-     to support of this toolchain.  PR 46175.  [Carlo Bramini 
-     <carlo.bramix libero.it>]  
-
-  *) Improve platform detection by updating config.guess and config.sub.
-     [Rainer Jung]
-
-  *) apr_socket_opt_set: Add support for APR_SO_BROADCAST. PR 46389.
-     [Armin Müller <mueller itestra com>]
-
-  *) Enable platform specific support for the opening of a file or
-     pipe in non-blocking mode through the APR_FOPEN_NONBLOCK flag.
-     [Graham Leggett]
+  *) http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?view=markup
 
 Changes for APR 1.4.x and later:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?view=markup
 
 Changes for APR 1.3.x and later:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?view=markup
 
 Changes for APR 1.2.x and later:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/CHANGES?view=markup
 
 Changes for APR 1.1.x and later:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/1.1.x/CHANGES?view=markup
 
 Changes for APR 1.0.x and later:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/1.0.x/CHANGES?view=markup
 
 Changes for APR 0.9.x and later/earlier:
 
   *) http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/CHANGES?view=markup
Index: head/contrib/apr/CMakeLists.txt
===================================================================
--- head/contrib/apr/CMakeLists.txt	(revision 361677)
+++ head/contrib/apr/CMakeLists.txt	(revision 361678)
@@ -1,427 +1,431 @@
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT 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 README.cmake before using this.
 
 PROJECT(APR C)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 OPTION(APR_INSTALL_PRIVATE_H  "Install selected private .h files (for httpd)"  OFF)
 OPTION(APR_HAVE_IPV6        "IPv6 support"                 ON)
 OPTION(INSTALL_PDB          "Install .pdb files (if generated)"  ON)
 OPTION(APR_BUILD_TESTAPR    "Build the test suite"         OFF)
 OPTION(TEST_STATIC_LIBS     "Test programs use APR static libraries instead of shared libraries?" OFF)
 SET(MIN_WINDOWS_VER             "Vista" 
     CACHE STRING "Minimum Windows version")
 
 # create 1-or-0 representation of feature tests for apr.h
 
 SET(apr_have_ipv6_10 0)
 
 IF(APR_HAVE_IPV6)
   SET(apr_have_ipv6_10 1)
 ENDIF()
 
 IF("${MIN_WINDOWS_VER}" STREQUAL "")
   SET(win32_winnt_str "0x0600")
 ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Vista")
   SET(win32_winnt_str "0x0600")
 ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Windows7")
   SET(win32_winnt_str "0x0601")
 ELSE()
   SET(win32_winnt_str ${MIN_WINDOWS_VER})
 ENDIF()
 
 CONFIGURE_FILE(include/apr.hwc
                ${PROJECT_BINARY_DIR}/apr.h)
 
 ADD_EXECUTABLE(gen_test_char tools/gen_test_char.c)
 GET_TARGET_PROPERTY(GEN_TEST_CHAR_EXE gen_test_char LOCATION)
 ADD_CUSTOM_COMMAND(
   COMMENT "Generating character tables, apr_escape_test_char.h, for current locale"
   DEPENDS gen_test_char
   COMMAND ${GEN_TEST_CHAR_EXE} > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
   OUTPUT ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
 )
 ADD_CUSTOM_TARGET(
   test_char_header ALL
   DEPENDS ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
 )
 
 # Generated .h files are stored in PROJECT_BINARY_DIR, not the
 # source tree.
 #
 # BROKEN: not searching PROJECT_BINARY_DIR first, so you have to
 #         manually delete apr.h in PROJECT_SOURCE_DIR/include if
 #         you've generated apr.h before using a different build
 
 SET(APR_INCLUDE_DIRECTORIES
   ${PROJECT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}/include/arch/win32
   ${CMAKE_CURRENT_SOURCE_DIR}/include/arch/unix
   ${CMAKE_CURRENT_SOURCE_DIR}/include/private
 )
 
 SET(APR_SYSTEM_LIBS
   ws2_32
   mswsock
   rpcrt4
 )
 
 INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES})
 
 SET(APR_PUBLIC_HEADERS_STATIC
   include/apr_allocator.h
   include/apr_atomic.h
+  include/apr_cstr.h
   include/apr_dso.h
   include/apr_env.h
   include/apr_errno.h
   include/apr_escape.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_perms_set.h
   include/apr_poll.h
   include/apr_pools.h
   include/apr_portable.h
   include/apr_proc_mutex.h
   include/apr_random.h
   include/apr_ring.h
   include/apr_shm.h
   include/apr_signal.h
   include/apr_skiplist.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
 )
 SET(APR_PUBLIC_HEADERS_GENERATED
   ${PROJECT_BINARY_DIR}/apr.h
 )
 
 SET(APR_SOURCES
   atomic/win32/apr_atomic.c
   dso/win32/dso.c
   encoding/apr_escape.c
   file_io/unix/copy.c
   file_io/unix/fileacc.c
   file_io/unix/filepath_util.c
   file_io/unix/fullrw.c
   file_io/unix/mktemp.c
   file_io/unix/tempdir.c
   file_io/win32/buffer.c
   file_io/win32/dir.c
   file_io/win32/filedup.c
   file_io/win32/filepath.c
   file_io/win32/filestat.c
   file_io/win32/filesys.c
   file_io/win32/flock.c
   file_io/win32/open.c
   file_io/win32/pipe.c
   file_io/win32/readwrite.c
   file_io/win32/seek.c
   locks/win32/proc_mutex.c
   locks/win32/thread_cond.c
   locks/win32/thread_mutex.c
   locks/win32/thread_rwlock.c
   memory/unix/apr_pools.c
   misc/unix/errorcodes.c
   misc/unix/getopt.c
   misc/unix/otherchild.c
   misc/unix/version.c
   misc/win32/charset.c
   misc/win32/env.c
   misc/win32/internal.c
   misc/win32/misc.c
   misc/win32/rand.c
   misc/win32/start.c
   misc/win32/utf8.c
   mmap/unix/common.c
   mmap/win32/mmap.c
   network_io/unix/inet_ntop.c
   network_io/unix/inet_pton.c
   network_io/unix/multicast.c
   network_io/unix/sockaddr.c
   network_io/unix/socket_util.c
   network_io/win32/sendrecv.c
   network_io/win32/sockets.c
   network_io/win32/sockopt.c
   passwd/apr_getpass.c
   poll/unix/poll.c
   poll/unix/pollcb.c
   poll/unix/pollset.c
   poll/unix/select.c
+  poll/unix/wakeup.c
   random/unix/apr_random.c
   random/unix/sha2.c
   random/unix/sha2_glue.c
   shmem/win32/shm.c
   strings/apr_cpystrn.c
+  strings/apr_cstr.c
   strings/apr_fnmatch.c
   strings/apr_snprintf.c
   strings/apr_strings.c
   strings/apr_strnatcmp.c
   strings/apr_strtok.c
   tables/apr_hash.c
   tables/apr_skiplist.c
   tables/apr_tables.c
   threadproc/win32/proc.c
   threadproc/win32/signals.c
   threadproc/win32/thread.c
   threadproc/win32/threadpriv.c
   time/win32/time.c
   time/win32/timestr.c
   user/win32/groupinfo.c
   user/win32/userinfo.c
 )
 
 SET(APR_TEST_SOURCES
   test/abts.c
   test/testargs.c
   test/testatomic.c
   test/testcond.c
   test/testdir.c
   test/testdso.c
   test/testdup.c
   test/testenv.c
   test/testescape.c
   test/testfile.c
   test/testfilecopy.c
   test/testfileinfo.c
   test/testflock.c
   test/testfmt.c
   test/testfnmatch.c
   test/testglobalmutex.c
   test/testhash.c
   test/testipsub.c
   test/testlfs.c
   test/testlock.c
   test/testmmap.c
   test/testnames.c
   test/testoc.c
   test/testpath.c
   test/testpipe.c
   test/testpoll.c
   test/testpools.c
   test/testproc.c
   test/testprocmutex.c
   test/testrand.c
   test/testshm.c
   test/testskiplist.c
   test/testsleep.c
   test/testsock.c
   test/testsockets.c
   test/testsockopt.c
   test/teststr.c
   test/teststrnatcmp.c
   test/testtable.c
   test/testtemp.c
   test/testthread.c
   test/testtime.c
   test/testud.c
   test/testuser.c
   test/testutil.c
   test/testvsn.c
 )
 
 SET(install_targets)
 SET(install_bin_pdb)
 
 # libapr-1 is shared, apr-1 is static
 ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc)
 SET(install_targets ${install_targets} libapr-1)
 SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb)
 TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS})
 SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT")
 ADD_DEPENDENCIES(libapr-1 test_char_header)
 
 ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} apr-1)
 TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS})
 SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT")
 ADD_DEPENDENCIES(apr-1 test_char_header)
 
 # libaprapp-1 and aprapp-1 are static
 ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} libaprapp-1)
 SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT")
 
 ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} aprapp-1)
 SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT")
 
 IF(APR_BUILD_TESTAPR)
   ENABLE_TESTING()
   # Create a "check" target that displays test program output to the console.
   ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
 
   # copy data files to build directory so that we can run programs from there
   EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory 
                   ${PROJECT_BINARY_DIR}/data)
   EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different 
                   ${PROJECT_SOURCE_DIR}/test/data/file_datafile.txt
                   ${PROJECT_BINARY_DIR}/data/file_datafile.txt)
   EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different
                   ${PROJECT_SOURCE_DIR}/test/data/mmap_datafile.txt
                   ${PROJECT_BINARY_DIR}/data/mmap_datafile.txt)
 
   IF(TEST_STATIC_LIBS)
     SET(whichapr    apr-1)
     SET(whichaprapp aprapp-1)
     SET(apiflag     -DAPR_DECLARE_STATIC)
   ELSE()
     SET(whichapr    libapr-1)
     SET(whichaprapp libaprapp-1)
     SET(apiflag)
   ENDIF()
 
   ADD_EXECUTABLE(testapp test/testapp.c)
   TARGET_LINK_LIBRARIES(testapp ${whichapr} ${whichaprapp} ${APR_SYSTEM_LIBS})
   SET_TARGET_PROPERTIES(testapp PROPERTIES LINK_FLAGS /entry:wmainCRTStartup)
   IF(apiflag)
     SET_TARGET_PROPERTIES(testapp PROPERTIES COMPILE_FLAGS ${apiflag})
   ENDIF()
   ADD_TEST(NAME testapp COMMAND testapp)
 
   ADD_EXECUTABLE(testall ${APR_TEST_SOURCES})
   TARGET_LINK_LIBRARIES(testall ${whichapr} ${APR_SYSTEM_LIBS})
   IF(apiflag)
     SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_FLAGS ${apiflag})
   ENDIF()
   ADD_TEST(NAME testall COMMAND testall)
 
   ADD_LIBRARY(mod_test MODULE test/mod_test.c)
   TARGET_LINK_LIBRARIES(mod_test ${whichapr} ${APR_SYSTEM_LIBS})
   SET_PROPERTY(TARGET mod_test APPEND PROPERTY LINK_FLAGS /export:print_hello)
   # nasty work-around for difficulties adding more than one additional flag
   # (they get joined in a bad way behind the scenes)
   GET_PROPERTY(link_flags TARGET mod_test PROPERTY LINK_FLAGS)
   SET(link_flags "${link_flags} /export:count_reps")
   SET_TARGET_PROPERTIES(mod_test PROPERTIES LINK_FLAGS ${link_flags})
   IF(apiflag)
     SET_TARGET_PROPERTIES(mod_test PROPERTIES COMPILE_FLAGS ${apiflag})
   ENDIF()
 
   # Build all the single-source executable files with no special build
   # requirements.
   SET(single_source_programs
     test/echod.c
     test/sendfile.c
     test/sockperf.c
     test/testlockperf.c
     test/testmutexscope.c
     test/globalmutexchild.c
     test/occhild.c
     test/proc_child.c
     test/readchild.c
     test/sockchild.c
     test/testshmproducer.c
     test/testshmconsumer.c
     test/tryread.c
     test/internal/testucs.c
   )
 
   FOREACH(sourcefile ${single_source_programs})
     STRING(REGEX REPLACE ".*/([^\\]+)\\.c" "\\1" proggie ${sourcefile})
     ADD_EXECUTABLE(${proggie} ${sourcefile})
     TARGET_LINK_LIBRARIES(${proggie} ${whichapr} ${APR_SYSTEM_LIBS})
     IF(apiflag)
       SET_TARGET_PROPERTIES(${proggie} PROPERTIES COMPILE_FLAGS ${apiflag})
     ENDIF()
   ENDFOREACH()
 
   # Add tests for programs that run by themselves with no arguments.
   SET(simple_tests
     testmutexscope
     testucs
   )
 
   FOREACH(simple ${simple_tests})
     ADD_TEST(NAME ${simple} COMMAND ${simple})
   ENDFOREACH()
 
   # testlockperf takes forever on Windows with default counter limit
   ADD_TEST(NAME testlockperf COMMAND testlockperf -c 50000)
 
   # sendfile runs multiple times with different parameters.
   FOREACH(sendfile_mode blocking nonblocking timeout)
     ADD_TEST(NAME sendfile-${sendfile_mode} COMMAND sendfile client ${sendfile_mode} startserver)
   ENDFOREACH()
 
   # No test is added for echod+sockperf.  Those will have to be run manually.
 
 ENDIF (APR_BUILD_TESTAPR)
 
 # Installation
 
 INSTALL(TARGETS ${install_targets}
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
         ARCHIVE DESTINATION lib
        )
 
 IF(INSTALL_PDB)
   INSTALL(FILES ${install_bin_pdb}
           DESTINATION bin
           CONFIGURATIONS RelWithDebInfo Debug)
 ENDIF()
 
 INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
 IF(APR_INSTALL_PRIVATE_H)
   # Kludges for unexpected dependencies of httpd 2.x, not installed by default
   SET(APR_PRIVATE_H_FOR_HTTPD
     include/arch/win32/apr_arch_file_io.h
     include/arch/win32/apr_arch_misc.h
     include/arch/win32/apr_arch_utf8.h
     include/arch/win32/apr_private.h
     )
   INSTALL(FILES ${APR_PRIVATE_H_FOR_HTTPD} DESTINATION include/arch/win32)
   INSTALL(FILES include/arch/apr_private_common.h DESTINATION include/arch)
 ENDIF()
 
 STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)
 MESSAGE(STATUS "")
 MESSAGE(STATUS "")
 MESSAGE(STATUS "APR configuration summary:")
 MESSAGE(STATUS "")
 
 MESSAGE(STATUS "  Build type ...................... : ${CMAKE_BUILD_TYPE}")
 MESSAGE(STATUS "  Install .pdb (if available)...... : ${INSTALL_PDB}")
 MESSAGE(STATUS "  Install prefix .................. : ${CMAKE_INSTALL_PREFIX}")
 MESSAGE(STATUS "  C compiler ...................... : ${CMAKE_C_COMPILER}")
 MESSAGE(STATUS "  IPv6 ............................ : ${APR_HAVE_IPV6}")
 MESSAGE(STATUS "  Minimum Windows version ......... : ${MIN_WINDOWS_VER}")
 MESSAGE(STATUS "  Build test suite ................ : ${APR_BUILD_TESTAPR}")
 IF(TEST_STATIC_LIBS)
 MESSAGE(STATUS "    (testing static libraries)")
 ELSE()
 MESSAGE(STATUS "    (testing dynamic libraries)")
 ENDIF()
 MESSAGE(STATUS "  Install private .h for httpd .... : ${APR_INSTALL_PRIVATE_H}")
Index: head/contrib/apr/Makefile.in
===================================================================
--- head/contrib/apr/Makefile.in	(revision 361677)
+++ head/contrib/apr/Makefile.in	(revision 361678)
@@ -1,148 +1,150 @@
 
 srcdir=@srcdir@
 VPATH=@srcdir@
 top_srcdir=@apr_srcdir@
 top_blddir=@apr_builddir@
 
 #
 # 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
 OSDIR=$(top_srcdir)/include/arch/@OSDIR@
 DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
 INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(top_blddir)/include/private
 
 #
 # Macros for target determination
 #
 CLEAN_SUBDIRS= test
 INSTALL_SUBDIRS=@INSTALL_SUBDIRS@
 
 TARGET_LIB = lib@APR_LIBNAME@.la
 APR_PCFILE = apr-$(APR_MAJOR_VERSION).pc
 APR_CONFIG = apr-$(APR_MAJOR_VERSION)-config
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
 #
 # Rules for building specific targets, starting with 'all' for
 # building the entire package.
 #
 TARGETS = $(TARGET_LIB) include/private/apr_escape_test_char.h apr.exp apr-config.out build/apr_rules.out
 
 LT_VERSION = @LT_VERSION@
 
 # bring in rules.mk for standard functionality
 @INCLUDE_RULES@
 @INCLUDE_OUTPUTS@
 
 CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
 	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
 	tools/gen_test_char.o tools/gen_test_char.lo \
 	include/private/apr_escape_test_char.h
 DISTCLEAN_TARGETS = config.cache config.log config.status \
 	include/apr.h include/arch/unix/apr_private.h \
 	libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
 	build/pkg/pkginfo
 EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in \
 	build-outputs.mk build/ltcf-c.sh build/aclocal.m4 \
 	build/ltconfig build/ltmain.sh \
 	build/argz.m4 build/libtool.m4 build/ltoptions.m4 \
 	build/ltsugar.m4 build/ltversion.m4 build/lt~obsolete.m4
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 libdir=@libdir@
 includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
 installbuilddir=@installbuilddir@
 
 # 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 -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
 
 install: $(TARGETS)
 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
 		     $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
 	$(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
 	for f in $(top_srcdir)/include/apr_*.h; do \
 	    $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
 	done
 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
 	$(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
 	$(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
 	for f in libtool shlibtool; do \
 	    if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \
 	done
 	$(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
 	for f in make_exports.awk make_var_export.awk; do \
 	    $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
 	done
 	$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
 	$(INSTALL) -m 755 apr-config.out $(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): $(OBJECTS)
 	$(LINK) @lib_target@ $(ALL_LIBS)
 
 encoding/apr_escape.lo: include/private/apr_escape_test_char.h 
 
 exports.c: $(HEADERS)
 	$(APR_MKEXPORT) $(HEADERS) > $@
 
 export_vars.c: $(HEADERS)
 	$(APR_MKVAREXPORT) $(HEADERS) > $@
 
 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
 
 gcov: 
 	@build/run-gcov.sh
 
 test: check
 check: $(TARGET_LIB)
 	cd test && $(MAKE) all check
 
 etags:
 	etags `find . -name '*.[ch]'`
 
 OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
 tools/gen_test_char.lo: tools/gen_test_char.c
 	$(APR_MKDIR) tools
 	$(LT_COMPILE)
 
 tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
 	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
 
 include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
 	$(APR_MKDIR) include/private
 	tools/gen_test_char@EXEEXT@ > $@
 
 LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
 	    @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
 
 # DO NOT REMOVE
 docs: $(INCDIR)/*.h
Index: head/contrib/apr/Makefile.win
===================================================================
--- head/contrib/apr/Makefile.win	(revision 361677)
+++ head/contrib/apr/Makefile.win	(revision 361678)
@@ -1,181 +1,171 @@
 # Makefile.win for Win32 APR alone
 #
 # Targets are:
 #
 #     buildall - compile everything
 #     checkall - run APR regression tests
 #     install  - compile everything
 #     clean    - mop up everything
 #
 # You can override the build mechanism, choose only one;
 #
 #     USEMAK=1 - compile from exported make files
 #     USEDSW=1 - compile from .dsw / .dsp VC6 projects
 #     USESLN=1 - compile from converted .sln / .vcproj VC7+ files
 #
 # Define ARCH to your desired preference (your PATH must point
 # to the correct compiler tools!)  Choose only one;
 #
 #     ARCH="Win32 Release"
 #     ARCH="Win32 Debug"
-#     ARCH="Win32 Release9x"
-#     ARCH="Win32 Debug9x"
 #     ARCH="x64 Release"
 #     ARCH="x64 Debug"
 #
 # For example;
 #
 #   nmake -f Makefile.win PREFIX=C:\APR buildall checkall install clean
 #
 
 !IF EXIST("apr.sln") && ([devenv /help > NUL 2>&1] == 0) \
     && !defined(USEMAK) && !defined(USEDSW)
 USESLN=1
 USEMAK=0
 USEDSW=0
 !ELSEIF EXIST("apr.mak") && !defined(USEDSW)
 USESLN=0
 USEMAK=1
 USEDSW=0
 !ELSE
 USESLN=0
 USEMAK=0
 USEDSW=1
 !ENDIF
 
 PREFIX=..\apr-dist
 
 !IF [$(COMSPEC) /c cl /nologo /? \
 	| $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
 ARCH=x64 Release
 !ELSE
 ARCH=Win32 Release
 !ENDIF
 
 !MESSAGE ARCH        = $(ARCH)
 !MESSAGE PREFIX      = $(PREFIX)  (install path)
 
 
 # Utility and Translation things, nothing here for the user
 #
 !IF "$(ARCH)" == "Win32 Release"
 SLNARCH=Release|Win32
 ARCHOSPATH=Release
 LIBSOSPATH=LibR
 !ELSEIF "$(ARCH)" == "Win32 Debug"
 SLNARCH=Debug|Win32
 ARCHOSPATH=Debug
 LIBSOSPATH=LibD
-!ELSEIF "$(ARCH)" == "Win32 Release9x"
-SLNARCH=Release9x|Win32
-ARCHOSPATH=9x\Release
-LIBSOSPATH=9x\LibR
-!ELSEIF "$(ARCH)" == "Win32 Debug9x"
-SLNARCH=Debug9x|Win32
-ARCHOSPATH=9x\Debug
-LIBSOSPATH=9x\LibD
 !ELSEIF "$(ARCH)" == "x64 Release"
 SLNARCH=Release|x64
 ARCHOSPATH=x64\Release
 LIBSOSPATH=x64\LibR
 !ELSEIF "$(ARCH)" == "x64 Debug"
 SLNARCH=Debug|x64
 ARCHOSPATH=x64\Debug
 LIBSOSPATH=x64\LibD
 !ENDIF
 
 !IFNDEF MAKEOPT
 # Only default the behavior if MAKEOPT= is omitted
 !IFDEF _NMAKE_VER
 # Microsoft NMake options
 MAKEOPT=-nologo
 !ELSEIF "$(MAKE)" == "make"
 # Borland make options?  Not really supported (yet)
 MAKEOPT=-s -N
 !ENDIF
 !ENDIF
 
 
 all: buildall checkall
 
 !IF $(USEMAK) == 1
 
 clean:
 	$(MAKE) $(MAKEOPT) -f Makefile.win ARCH="$(ARCH)" \
 		CTARGET=CLEAN buildall
 
 buildall:
 	$(MAKE) $(MAKEOPT) -f apr.mak         CFG="apr - $(ARCH)" RECURSE=0 $(CTARGET)
 	$(MAKE) $(MAKEOPT) -f libapr.mak      CFG="libapr - $(ARCH)" RECURSE=0 $(CTARGET)
 	cd build
 	 $(MAKE) $(MAKEOPT) -f aprapp.mak     CFG="aprapp - $(ARCH)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f libaprapp.mak  CFG="libaprapp - $(ARCH)" RECURSE=0 $(CTARGET)
 	cd ..
 
 !ELSEIF $(USESLN) == 1
 
 clean:
 	-devenv apr.sln /useenv /clean "$(SLNARCH)" /project libaprapp
 	-devenv apr.sln /useenv /clean "$(SLNARCH)" /project libapr
 	-devenv apr.sln /useenv /clean "$(SLNARCH)" /project aprapp
 	-devenv apr.sln /useenv /clean "$(SLNARCH)" /project apr
 
 buildall:
 	devenv apr.sln /useenv /build "$(SLNARCH)" /project apr
 	devenv apr.sln /useenv /build "$(SLNARCH)" /project aprapp
 	devenv apr.sln /useenv /build "$(SLNARCH)" /project libapr
 	devenv apr.sln /useenv /build "$(SLNARCH)" /project libaprapp
 
 !ELSE
 #	$(USEDSP) == 1
 
 clean:
 	-msdev apr.dsw /USEENV /MAKE "libaprapp - $(ARCH)" /CLEAN
 	-msdev apr.dsw /USEENV /MAKE "libapr - $(ARCH)" /CLEAN
 	-msdev apr.dsw /USEENV /MAKE "aprapp - $(ARCH)" /CLEAN
 	-msdev apr.dsw /USEENV /MAKE "apr - $(ARCH)" /CLEAN
 
 buildall:
 	@msdev apr.dsw /USEENV /MAKE "apr - $(ARCH)"
 	@msdev apr.dsw /USEENV /MAKE "aprapp - $(ARCH)"
 	@msdev apr.dsw /USEENV /MAKE "libapr - $(ARCH)"
 	@msdev apr.dsw /USEENV /MAKE "libaprapp - $(ARCH)"
 
 !ENDIF
 
 
 checkapr:
 	cd test
 	 $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
 		OUTDIR=$(LIBSOSPATH) check
 	 $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=dynamic \
 		OUTDIR=$(ARCHOSPATH) check
 	 cd ..
 
 checkall: checkapr
 
 
 install:
 	echo Y >.y
 	echo A >.A
 	@if NOT EXIST "$(PREFIX)\."		mkdir "$(PREFIX)"
 	@if NOT EXIST "$(PREFIX)\bin\."		mkdir "$(PREFIX)\bin"
 	@if NOT EXIST "$(PREFIX)\include\."	mkdir "$(PREFIX)\include"
 	@if NOT EXIST "$(PREFIX)\lib\."		mkdir "$(PREFIX)\lib"
 	copy CHANGES "$(PREFIX)\APR-CHANGES.txt" <.y
 	copy LICENSE "$(PREFIX)\APR-LICENSE.txt" <.y
 	copy NOTICE  "$(PREFIX)\APR-NOTICE.txt"  <.y
 	xcopy include\*.h		"$(PREFIX)\include\" /d < .a
 	copy $(LIBSOSPATH)\apr-1.lib		"$(PREFIX)\lib\" <.y
 	copy $(LIBSOSPATH)\apr-1.pdb		"$(PREFIX)\lib\" <.y
 	copy $(LIBSOSPATH)\aprapp-1.lib		"$(PREFIX)\lib\" <.y
 	copy $(LIBSOSPATH)\aprapp-1.pdb		"$(PREFIX)\lib\" <.y
 	copy $(ARCHOSPATH)\libaprapp-1.lib	"$(PREFIX)\lib\" <.y
 	copy $(ARCHOSPATH)\libaprapp-1.pdb	"$(PREFIX)\lib\" <.y
 	copy $(ARCHOSPATH)\libapr-1.lib		"$(PREFIX)\lib\" <.y
 	copy $(ARCHOSPATH)\libapr-1.exp		"$(PREFIX)\lib\" <.y
 	copy $(ARCHOSPATH)\libapr-1.dll		"$(PREFIX)\bin\" <.y
 	copy $(ARCHOSPATH)\libapr-1.pdb		"$(PREFIX)\bin\" <.y
 	del .y
 	del .a
 
Index: head/contrib/apr/NOTICE
===================================================================
--- head/contrib/apr/NOTICE	(revision 361677)
+++ head/contrib/apr/NOTICE	(revision 361678)
@@ -1,15 +1,15 @@
 Apache Portable Runtime
-Copyright (c) 2000-2015 The Apache Software Foundation.
+Copyright (c) 2000-2019 The Apache Software Foundation.
 
 This product includes software developed at
 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.
Index: head/contrib/apr/NWGNUmakefile
===================================================================
--- head/contrib/apr/NWGNUmakefile	(revision 361677)
+++ head/contrib/apr/NWGNUmakefile	(revision 361678)
@@ -1,433 +1,434 @@
 #
 # Define our macros with defaults if we dont got them already.
 #
 ifndef APR_WORK
 export APR_WORK = $(CURDIR)
 endif
 ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h"
 $(error APR_WORK does not point to a valid APR source tree) 
 endif
 ifndef APU_WORK
 export APU_WORK = $(CURDIR)/../apr-util
 endif
 ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h"
 $(error APU_WORK does not point to a valid APU source tree) 
 endif
 
 #
 # Declare the sub-directories to be built here
 #
 
 SUBDIRS = \
 		build \
 		$(APU_WORK) \
 		$(EOLIST)
 
 ifeq "$(TEST)" "1"
 SUBDIRS += \
 		test \
 		$(APU_WORK)/test \
 		$(EOLIST)
 endif
 
 #
 # 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)/include \
 			$(APR)/include/private \
 			$(APR)/include/arch/NetWare \
 			$(APR)/include/arch/unix \
 			$(APR)/memory/unix \
 			$(APR)/random/unix \
 			$(APU)/include \
 			$(APU)/xml \
 			$(LDAPSDK)/inc \
 			$(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) $(VERSION_SKT)
 
 #
 # 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	=
 
 #
 # 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)/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 = \
 	$(PRELUDE) \
 	$(APRLIB) \
 	$(APULIB) \
 	$(APULDAPLIB) \
 	$(APUXMLLIB) \
 	$(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 \
 	$(EOLIST)
 
 # Include the Winsock libraries if Winsock is being used
 ifndef USE_STDSOCKETS
 FILES_nlm_modules += ws2_32 \
 	$(EOLIST)
 endif
 
 #If the LDAP support is defined then add the auto-load modules
 ifneq "$(LDAPSDK)" ""
 FILES_nlm_modules += \
 	lldapsdk \
 	lldapssl \
 	$(EOLIST)
 endif
 
 #
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
 
 #
 # If the nlm has a hlp file put it's path here
 #
 FILE_nlm_hlp =
 
 #
 # If this is specified, it will override $(NWOS)\copyright.txt.
 #
 FILE_nlm_copyright =
 
 #
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
 	@netware.imp \
 	$(EOLIST)
 
 # Include the Winsock imports if Winsock is being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports +=  \
 	@ws2nlm.imp \
 	WSAStartupRTags \
 	WSACleanupRTag \
 	$(EOLIST)
 endif
 
 #If the LDAP support is defined then add the imports
 ifneq "$(LDAPSDK)" ""
 FILES_nlm_Ximports += \
 	@lldapsdk.imp \
 	@lldapssl.imp \
 	$(EOLIST)
 endif
 
 #
 # 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_atomic.o \
 	$(OBJDIR)/apr_cpystrn.o \
 	$(OBJDIR)/apr_escape.o \
 	$(OBJDIR)/apr_fnmatch.o \
 	$(OBJDIR)/apr_getpass.o \
 	$(OBJDIR)/apr_hash.o \
 	$(OBJDIR)/apr_pools.o \
 	$(OBJDIR)/apr_random.o \
 	$(OBJDIR)/apr_skiplist.o \
 	$(OBJDIR)/apr_snprintf.o \
 	$(OBJDIR)/apr_strings.o \
 	$(OBJDIR)/apr_strnatcmp.o \
 	$(OBJDIR)/apr_strtok.o \
 	$(OBJDIR)/apr_tables.o \
 	$(OBJDIR)/buffer.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)/mktemp.o \
 	$(OBJDIR)/mmap.o \
 	$(OBJDIR)/multicast.o \
 	$(OBJDIR)/open.o \
 	$(OBJDIR)/pipe.o \
 	$(OBJDIR)/otherchild.o \
 	$(OBJDIR)/proc.o \
 	$(OBJDIR)/procsup.o \
 	$(OBJDIR)/proc_mutex.o \
 	$(OBJDIR)/rand.o \
 	$(OBJDIR)/readwrite.o \
 	$(OBJDIR)/seek.o \
 	$(OBJDIR)/pollcb.o \
 	$(OBJDIR)/pollset.o \
 	$(OBJDIR)/select.o \
 	$(OBJDIR)/sendrecv.o \
 	$(OBJDIR)/sha2.o \
 	$(OBJDIR)/sha2_glue.o \
 	$(OBJDIR)/shm.o \
 	$(OBJDIR)/signals.o \
 	$(OBJDIR)/sockaddr.o \
 	$(OBJDIR)/socket_util.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 \
+	$(OBJDIR)/wakeup.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
 	$(call COPY,$(APR)/$(TARGET_nlm),$(INSTALLBASE)/)
 ifndef DEST
 	-$(call COPY,$(APR)/LICENSE,$(INSTALLBASE)/)
 	-$(call COPY,$(APR)/STATUS,$(INSTALLBASE)/STATUS.apr)
 	-$(call COPY,$(APR)/CHANGES,$(INSTALLBASE)/CHANGES.apr)
 	-$(call COPY,$(APU)/STATUS,$(INSTALLBASE)/STATUS.apu)
 	-$(call COPY,$(APU)/CHANGES,$(INSTALLBASE)/CHANGES.apu)
 	-$(call COPYR,$(APR)/docs,$(INSTALLBASE)/docs/)
 endif
 
 ifndef DEST
 installdev :: $(INSTDEVDIRS) FORCE
 	$(call COPY,$(APR)/include/*.h,$(INSTALLBASE)/include/)
 	$(call COPY,$(APR)/*.imp,$(INSTALLBASE)/lib/)
 	$(call COPY,$(APR)/misc/netware/*.xdc,$(INSTALLBASE)/lib/)
 	$(call COPY,$(APR)/$(TARGET_nlm),$(INSTALLBASE)/bin/)
 	$(call COPY,$(APRLIB),$(INSTALLBASE)/lib/)
 	$(call COPY,$(APULIB),$(INSTALLBASE)/lib/)
 	$(call COPY,$(APULDAPLIB),$(INSTALLBASE)/lib/)
 	$(call COPY,$(APUXMLLIB),$(INSTALLBASE)/lib/)
 
 $(INSTDEVDIRS) ::
 	$(call MKDIR,$@)
 endif
 
 #
 # Any specialized rules here
 #
 
 vpath %.c atomic/netware:strings:tables:passwd:lib:time/unix
 vpath %.c file_io/unix:locks/netware:misc/netware:misc/unix:threadproc/netware
 vpath %.c poll/unix:shmem/unix:support/unix:random/unix
 vpath %.c dso/netware:memory/unix:mmap/unix:user/netware:encoding
 
 # Use the win32 network_io if Winsock is being used
 ifndef USE_STDSOCKETS
 vpath %.c network_io/win32
 endif
 vpath %.c network_io/unix
 
 $(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)/$(NLM_NAME)_cc.opt
 #	@echo Compiling $<
 	@echo $(DL)CC   $<$(DL)
 	$(CC) $< -cwd source -o=$@ @$(OBJDIR)/$(NLM_NAME)_cc.opt
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined
 # in this makefile
 #
 
 include $(APRBUILD)/NWGNUtail.inc
 
 
Index: head/contrib/apr/apr.dsp
===================================================================
--- head/contrib/apr/apr.dsp	(revision 361677)
+++ head/contrib/apr/apr.dsp	(revision 361678)
@@ -1,913 +1,831 @@
 # 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 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE NMAKE /f "apr.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 Release"
 !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 "apr - Win32 Release9x" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - x64 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 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /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 /out:"LibR\apr-1.lib"
 
 !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 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /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 /out:"LibD\apr-1.lib"
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "9x\LibR"
-# PROP BASE Intermediate_Dir "9x\LibR"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "9x\LibR"
-# PROP Intermediate_Dir "9x\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 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /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 /out:"9x\LibR\apr-1.lib"
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "9x\LibD"
-# PROP BASE Intermediate_Dir "9x\LibD"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "9x\LibD"
-# PROP Intermediate_Dir "9x\LibD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /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 /out:"9x\LibD\apr-1.lib"
-
 !ELSEIF  "$(CFG)" == "apr - x64 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "x64\LibR"
 # PROP BASE Intermediate_Dir "x64\LibR"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "x64\LibR"
 # PROP Intermediate_Dir "x64\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 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /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 /out:"x64\LibR\apr-1.lib"
 
 !ELSEIF  "$(CFG)" == "apr - x64 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "x64\LibD"
 # PROP BASE Intermediate_Dir "x64\LibD"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "x64\LibD"
 # PROP Intermediate_Dir "x64\LibD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /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 /out:"x64\LibD\apr-1.lib"
 
 !ENDIF 
 
 # Begin Target
 
 # Name "apr - Win32 Release"
 # Name "apr - Win32 Debug"
-# Name "apr - Win32 Release9x"
-# Name "apr - Win32 Debug9x"
 # Name "apr - x64 Release"
 # Name "apr - x64 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ".c"
 # Begin Group "atomic"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\atomic\win32\apr_atomic.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\atomic\win32\apr_atomic64.c
+# End Source File
 # End Group
 # Begin Group "dso"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\dso\win32\dso.c
 # End Source File
 # End Group
 # Begin Group "encoding"
 
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\encoding\apr_encode.c
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\encoding\apr_escape.c
 
 # End Source File
 # End Group
 # Begin Group "file_io"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\file_io\win32\buffer.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\file_io\unix\copy.c
 # End Source File
 # Begin Source File
 
 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=.\network_io\unix\multicast.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\unix\socket_util.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 "poll"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\poll\unix\poll.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\poll\unix\pollcb.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\poll\unix\pollset.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\poll\unix\select.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\poll\unix\wakeup.c
+# End Source File
 # End Group
 # Begin Group "random"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\random\unix\apr_random.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\random\unix\sha2.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\random\unix\sha2_glue.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_cstr.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_skiplist.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\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
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
-
-# 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 Debug9x"
-
-# 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 - x64 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 - x64 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_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_escape.h
-# End Source File
-# Begin Source File
 
-SOURCE=.\include\apr_escape.h
+!IF  "$(CFG)" == "libapr - Win32 Release"
 
-!IF  "$(CFG)" == "apr - Win32 Release"
-
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibR\gen_test_char /Fe.\LibR\gen_test_char.exe .\tools\gen_test_char.c 
-	.\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
+	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Release\gen_test_char /Fe.\Release\gen_test_char.exe .\tools\gen_test_char.c 
+	.\Release\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
 
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibD\gen_test_char /Fe.\LibD\gen_test_char.exe .\tools\gen_test_char.c  
-	.\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
+	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Debug\gen_test_char /Fe.\Debug\gen_test_char.exe .\tools\gen_test_char.c  
+	.\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
+!ELSEIF  "$(CFG)" == "libapr - x64 Release"
 
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibR\gen_test_char /Fe.\9x\LibR\gen_test_char.exe .\tools\gen_test_char.c 
-	.\9x\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
+	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Release\gen_test_char /Fe.\x64\Release\gen_test_char.exe .\tools\gen_test_char.c 
+	.\x64\Release\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "libapr - x64 Debug"
 
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
-InputPath=.\include\apr_escape.h
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibD\gen_test_char /Fe.\9x\LibD\gen_test_char.exe .\tools\gen_test_char.c  
-	.\9x\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - x64 Release"
-
-# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
-InputPath=.\include\apr_escape.h
-
-InputPath=.\include\apr_escape.h
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibR\gen_test_char /Fe.\x64\LibR\gen_test_char.exe .\tools\gen_test_char.c 
-	.\x64\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - x64 Debug"
-
-# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
-InputPath=.\include\apr_escape.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibD\gen_test_char /Fe.\x64\LibD\gen_test_char.exe .\tools\gen_test_char.c 
-	.\x64\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
+	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Debug\gen_test_char /Fe.\x64\Debug\gen_test_char.exe .\tools\gen_test_char.c 
+	.\x64\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
 !ENDIF 
 
 # 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_random.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_skiplist.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
Index: head/contrib/apr/apr.mak
===================================================================
--- head/contrib/apr/apr.mak	(revision 361677)
+++ head/contrib/apr/apr.mak	(revision 361678)
@@ -1,1980 +1,1380 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on apr.dsp
 !IF "$(CFG)" == ""
 CFG=apr - Win32 Release
 !MESSAGE No configuration specified. Defaulting to apr - Win32 Release.
 !ENDIF 
 
-!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - Win32 Release9x" && "$(CFG)" != "apr - Win32 Debug9x" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug"
+!IF "$(CFG)" != "apr - Win32 Release" && "$(CFG)" != "apr - Win32 Debug" && "$(CFG)" != "apr - x64 Release" && "$(CFG)" != "apr - x64 Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !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 Release"
 !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 "apr - Win32 Release9x" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr - Win32 Debug9x" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - x64 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "apr - x64 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
 !ELSE 
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "apr - Win32 Release"
 
 OUTDIR=.\LibR
 INTDIR=.\LibR
 # Begin Custom Macros
 OutDir=.\LibR
 # End Custom Macros
 
-ALL : ".\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib"
+ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib"
 
 
 CLEAN :
 	-@erase "$(INTDIR)\apr-1.idb"
 	-@erase "$(INTDIR)\apr-1.pdb"
 	-@erase "$(INTDIR)\apr_atomic.obj"
+	-@erase "$(INTDIR)\apr_atomic64.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
+	-@erase "$(INTDIR)\apr_cstr.obj"
+	-@erase "$(INTDIR)\apr_encode.obj"
 	-@erase "$(INTDIR)\apr_escape.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
 	-@erase "$(INTDIR)\apr_getpass.obj"
 	-@erase "$(INTDIR)\apr_hash.obj"
 	-@erase "$(INTDIR)\apr_pools.obj"
 	-@erase "$(INTDIR)\apr_random.obj"
 	-@erase "$(INTDIR)\apr_skiplist.obj"
 	-@erase "$(INTDIR)\apr_snprintf.obj"
 	-@erase "$(INTDIR)\apr_strings.obj"
 	-@erase "$(INTDIR)\apr_strnatcmp.obj"
 	-@erase "$(INTDIR)\apr_strtok.obj"
 	-@erase "$(INTDIR)\apr_tables.obj"
 	-@erase "$(INTDIR)\buffer.obj"
 	-@erase "$(INTDIR)\charset.obj"
 	-@erase "$(INTDIR)\common.obj"
 	-@erase "$(INTDIR)\copy.obj"
 	-@erase "$(INTDIR)\dir.obj"
 	-@erase "$(INTDIR)\dso.obj"
 	-@erase "$(INTDIR)\env.obj"
 	-@erase "$(INTDIR)\errorcodes.obj"
 	-@erase "$(INTDIR)\fileacc.obj"
 	-@erase "$(INTDIR)\filedup.obj"
 	-@erase "$(INTDIR)\filepath.obj"
 	-@erase "$(INTDIR)\filepath_util.obj"
 	-@erase "$(INTDIR)\filestat.obj"
 	-@erase "$(INTDIR)\filesys.obj"
 	-@erase "$(INTDIR)\flock.obj"
 	-@erase "$(INTDIR)\fullrw.obj"
 	-@erase "$(INTDIR)\getopt.obj"
 	-@erase "$(INTDIR)\groupinfo.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
 	-@erase "$(INTDIR)\inet_pton.obj"
 	-@erase "$(INTDIR)\internal.obj"
 	-@erase "$(INTDIR)\misc.obj"
 	-@erase "$(INTDIR)\mktemp.obj"
 	-@erase "$(INTDIR)\mmap.obj"
 	-@erase "$(INTDIR)\multicast.obj"
 	-@erase "$(INTDIR)\open.obj"
 	-@erase "$(INTDIR)\otherchild.obj"
 	-@erase "$(INTDIR)\pipe.obj"
 	-@erase "$(INTDIR)\poll.obj"
 	-@erase "$(INTDIR)\pollcb.obj"
 	-@erase "$(INTDIR)\pollset.obj"
 	-@erase "$(INTDIR)\proc.obj"
 	-@erase "$(INTDIR)\proc_mutex.obj"
 	-@erase "$(INTDIR)\rand.obj"
 	-@erase "$(INTDIR)\readwrite.obj"
 	-@erase "$(INTDIR)\seek.obj"
 	-@erase "$(INTDIR)\select.obj"
 	-@erase "$(INTDIR)\sendrecv.obj"
 	-@erase "$(INTDIR)\sha2.obj"
 	-@erase "$(INTDIR)\sha2_glue.obj"
 	-@erase "$(INTDIR)\shm.obj"
 	-@erase "$(INTDIR)\signals.obj"
 	-@erase "$(INTDIR)\sockaddr.obj"
 	-@erase "$(INTDIR)\socket_util.obj"
 	-@erase "$(INTDIR)\sockets.obj"
 	-@erase "$(INTDIR)\sockopt.obj"
 	-@erase "$(INTDIR)\start.obj"
 	-@erase "$(INTDIR)\tempdir.obj"
 	-@erase "$(INTDIR)\thread.obj"
 	-@erase "$(INTDIR)\thread_cond.obj"
 	-@erase "$(INTDIR)\thread_mutex.obj"
 	-@erase "$(INTDIR)\thread_rwlock.obj"
 	-@erase "$(INTDIR)\threadpriv.obj"
 	-@erase "$(INTDIR)\time.obj"
 	-@erase "$(INTDIR)\timestr.obj"
 	-@erase "$(INTDIR)\userinfo.obj"
 	-@erase "$(INTDIR)\utf8.obj"
 	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\wakeup.obj"
 	-@erase "$(OUTDIR)\apr-1.lib"
 	-@erase ".\include\apr.h"
-	-@erase ".\include\apr_gen_test_char.h"
-	-@erase "$(OUTDIR)\gen_test_char.exe"
-	-@erase "$(OUTDIR)\gen_test_char.obj"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private"  /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" 
 BSC32_SBRS= \
 	
 LIB32=link.exe -lib
 LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" 
 LIB32_OBJS= \
 	"$(INTDIR)\apr_atomic.obj" \
+	"$(INTDIR)\apr_atomic64.obj" \
 	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\apr_encode.obj" \
 	"$(INTDIR)\apr_escape.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\copy.obj" \
 	"$(INTDIR)\dir.obj" \
 	"$(INTDIR)\fileacc.obj" \
 	"$(INTDIR)\filedup.obj" \
 	"$(INTDIR)\filepath.obj" \
 	"$(INTDIR)\filepath_util.obj" \
 	"$(INTDIR)\filestat.obj" \
 	"$(INTDIR)\filesys.obj" \
 	"$(INTDIR)\flock.obj" \
 	"$(INTDIR)\fullrw.obj" \
 	"$(INTDIR)\mktemp.obj" \
 	"$(INTDIR)\open.obj" \
 	"$(INTDIR)\pipe.obj" \
 	"$(INTDIR)\readwrite.obj" \
 	"$(INTDIR)\seek.obj" \
 	"$(INTDIR)\tempdir.obj" \
 	"$(INTDIR)\proc_mutex.obj" \
 	"$(INTDIR)\thread_cond.obj" \
 	"$(INTDIR)\thread_mutex.obj" \
 	"$(INTDIR)\thread_rwlock.obj" \
 	"$(INTDIR)\apr_pools.obj" \
 	"$(INTDIR)\charset.obj" \
 	"$(INTDIR)\env.obj" \
 	"$(INTDIR)\errorcodes.obj" \
 	"$(INTDIR)\getopt.obj" \
 	"$(INTDIR)\internal.obj" \
 	"$(INTDIR)\misc.obj" \
 	"$(INTDIR)\otherchild.obj" \
 	"$(INTDIR)\rand.obj" \
 	"$(INTDIR)\start.obj" \
 	"$(INTDIR)\utf8.obj" \
 	"$(INTDIR)\version.obj" \
 	"$(INTDIR)\common.obj" \
 	"$(INTDIR)\mmap.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
 	"$(INTDIR)\inet_pton.obj" \
 	"$(INTDIR)\multicast.obj" \
 	"$(INTDIR)\sendrecv.obj" \
 	"$(INTDIR)\sockaddr.obj" \
-	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\socket_util.obj" \
+	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\sockopt.obj" \
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\poll.obj" \
 	"$(INTDIR)\pollcb.obj" \
 	"$(INTDIR)\pollset.obj" \
 	"$(INTDIR)\select.obj" \
+	"$(INTDIR)\wakeup.obj" \
 	"$(INTDIR)\apr_random.obj" \
 	"$(INTDIR)\sha2.obj" \
 	"$(INTDIR)\sha2_glue.obj" \
 	"$(INTDIR)\shm.obj" \
 	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_cstr.obj" \
 	"$(INTDIR)\apr_fnmatch.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_strings.obj" \
 	"$(INTDIR)\apr_strnatcmp.obj" \
 	"$(INTDIR)\apr_strtok.obj" \
 	"$(INTDIR)\apr_hash.obj" \
 	"$(INTDIR)\apr_skiplist.obj" \
 	"$(INTDIR)\apr_tables.obj" \
 	"$(INTDIR)\proc.obj" \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
 	"$(INTDIR)\userinfo.obj"
 
 "$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
     $(LIB32) @<<
   $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
 <<
 
 !ELSEIF  "$(CFG)" == "apr - Win32 Debug"
 
 OUTDIR=.\LibD
 INTDIR=.\LibD
 # Begin Custom Macros
 OutDir=.\LibD
 # End Custom Macros
 
-ALL : ".\LibD\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib"
+ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib"
 
 
 CLEAN :
 	-@erase "$(INTDIR)\apr-1.idb"
 	-@erase "$(INTDIR)\apr-1.pdb"
 	-@erase "$(INTDIR)\apr_atomic.obj"
+	-@erase "$(INTDIR)\apr_atomic64.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
+	-@erase "$(INTDIR)\apr_cstr.obj"
+	-@erase "$(INTDIR)\apr_encode.obj"
 	-@erase "$(INTDIR)\apr_escape.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
 	-@erase "$(INTDIR)\apr_getpass.obj"
 	-@erase "$(INTDIR)\apr_hash.obj"
 	-@erase "$(INTDIR)\apr_pools.obj"
 	-@erase "$(INTDIR)\apr_random.obj"
 	-@erase "$(INTDIR)\apr_skiplist.obj"
 	-@erase "$(INTDIR)\apr_snprintf.obj"
 	-@erase "$(INTDIR)\apr_strings.obj"
 	-@erase "$(INTDIR)\apr_strnatcmp.obj"
 	-@erase "$(INTDIR)\apr_strtok.obj"
 	-@erase "$(INTDIR)\apr_tables.obj"
 	-@erase "$(INTDIR)\buffer.obj"
 	-@erase "$(INTDIR)\charset.obj"
 	-@erase "$(INTDIR)\common.obj"
 	-@erase "$(INTDIR)\copy.obj"
 	-@erase "$(INTDIR)\dir.obj"
 	-@erase "$(INTDIR)\dso.obj"
 	-@erase "$(INTDIR)\env.obj"
 	-@erase "$(INTDIR)\errorcodes.obj"
 	-@erase "$(INTDIR)\fileacc.obj"
 	-@erase "$(INTDIR)\filedup.obj"
 	-@erase "$(INTDIR)\filepath.obj"
 	-@erase "$(INTDIR)\filepath_util.obj"
 	-@erase "$(INTDIR)\filestat.obj"
 	-@erase "$(INTDIR)\filesys.obj"
 	-@erase "$(INTDIR)\flock.obj"
 	-@erase "$(INTDIR)\fullrw.obj"
 	-@erase "$(INTDIR)\getopt.obj"
 	-@erase "$(INTDIR)\groupinfo.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
 	-@erase "$(INTDIR)\inet_pton.obj"
 	-@erase "$(INTDIR)\internal.obj"
 	-@erase "$(INTDIR)\misc.obj"
 	-@erase "$(INTDIR)\mktemp.obj"
 	-@erase "$(INTDIR)\mmap.obj"
 	-@erase "$(INTDIR)\multicast.obj"
 	-@erase "$(INTDIR)\open.obj"
 	-@erase "$(INTDIR)\otherchild.obj"
 	-@erase "$(INTDIR)\pipe.obj"
 	-@erase "$(INTDIR)\poll.obj"
 	-@erase "$(INTDIR)\pollcb.obj"
 	-@erase "$(INTDIR)\pollset.obj"
 	-@erase "$(INTDIR)\proc.obj"
 	-@erase "$(INTDIR)\proc_mutex.obj"
 	-@erase "$(INTDIR)\rand.obj"
 	-@erase "$(INTDIR)\readwrite.obj"
 	-@erase "$(INTDIR)\seek.obj"
 	-@erase "$(INTDIR)\select.obj"
 	-@erase "$(INTDIR)\sendrecv.obj"
 	-@erase "$(INTDIR)\sha2.obj"
 	-@erase "$(INTDIR)\sha2_glue.obj"
 	-@erase "$(INTDIR)\shm.obj"
 	-@erase "$(INTDIR)\signals.obj"
 	-@erase "$(INTDIR)\sockaddr.obj"
 	-@erase "$(INTDIR)\socket_util.obj"
 	-@erase "$(INTDIR)\sockets.obj"
 	-@erase "$(INTDIR)\sockopt.obj"
 	-@erase "$(INTDIR)\start.obj"
 	-@erase "$(INTDIR)\tempdir.obj"
 	-@erase "$(INTDIR)\thread.obj"
 	-@erase "$(INTDIR)\thread_cond.obj"
 	-@erase "$(INTDIR)\thread_mutex.obj"
 	-@erase "$(INTDIR)\thread_rwlock.obj"
 	-@erase "$(INTDIR)\threadpriv.obj"
 	-@erase "$(INTDIR)\time.obj"
 	-@erase "$(INTDIR)\timestr.obj"
 	-@erase "$(INTDIR)\userinfo.obj"
 	-@erase "$(INTDIR)\utf8.obj"
 	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\wakeup.obj"
 	-@erase "$(OUTDIR)\apr-1.lib"
 	-@erase ".\include\apr.h"
-	-@erase ".\include\apr_gen_test_char.h"
-	-@erase "$(OUTDIR)\gen_test_char.exe"
-	-@erase "$(OUTDIR)\gen_test_char.obj"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" 
 BSC32_SBRS= \
 	
 LIB32=link.exe -lib
 LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" 
 LIB32_OBJS= \
 	"$(INTDIR)\apr_atomic.obj" \
+	"$(INTDIR)\apr_atomic64.obj" \
 	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\apr_encode.obj" \
 	"$(INTDIR)\apr_escape.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\copy.obj" \
 	"$(INTDIR)\dir.obj" \
 	"$(INTDIR)\fileacc.obj" \
 	"$(INTDIR)\filedup.obj" \
 	"$(INTDIR)\filepath.obj" \
 	"$(INTDIR)\filepath_util.obj" \
 	"$(INTDIR)\filestat.obj" \
 	"$(INTDIR)\filesys.obj" \
 	"$(INTDIR)\flock.obj" \
 	"$(INTDIR)\fullrw.obj" \
 	"$(INTDIR)\mktemp.obj" \
 	"$(INTDIR)\open.obj" \
 	"$(INTDIR)\pipe.obj" \
 	"$(INTDIR)\readwrite.obj" \
 	"$(INTDIR)\seek.obj" \
 	"$(INTDIR)\tempdir.obj" \
 	"$(INTDIR)\proc_mutex.obj" \
 	"$(INTDIR)\thread_cond.obj" \
 	"$(INTDIR)\thread_mutex.obj" \
 	"$(INTDIR)\thread_rwlock.obj" \
 	"$(INTDIR)\apr_pools.obj" \
 	"$(INTDIR)\charset.obj" \
 	"$(INTDIR)\env.obj" \
 	"$(INTDIR)\errorcodes.obj" \
 	"$(INTDIR)\getopt.obj" \
 	"$(INTDIR)\internal.obj" \
 	"$(INTDIR)\misc.obj" \
 	"$(INTDIR)\otherchild.obj" \
 	"$(INTDIR)\rand.obj" \
 	"$(INTDIR)\start.obj" \
 	"$(INTDIR)\utf8.obj" \
 	"$(INTDIR)\version.obj" \
 	"$(INTDIR)\common.obj" \
 	"$(INTDIR)\mmap.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
 	"$(INTDIR)\inet_pton.obj" \
 	"$(INTDIR)\multicast.obj" \
 	"$(INTDIR)\sendrecv.obj" \
 	"$(INTDIR)\sockaddr.obj" \
-	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\socket_util.obj" \
-	"$(INTDIR)\sockopt.obj" \
-	"$(INTDIR)\apr_getpass.obj" \
-	"$(INTDIR)\poll.obj" \
-	"$(INTDIR)\pollcb.obj" \
-	"$(INTDIR)\pollset.obj" \
-	"$(INTDIR)\select.obj" \
-	"$(INTDIR)\apr_random.obj" \
-	"$(INTDIR)\sha2.obj" \
-	"$(INTDIR)\sha2_glue.obj" \
-	"$(INTDIR)\shm.obj" \
-	"$(INTDIR)\apr_cpystrn.obj" \
-	"$(INTDIR)\apr_fnmatch.obj" \
-	"$(INTDIR)\apr_snprintf.obj" \
-	"$(INTDIR)\apr_strings.obj" \
-	"$(INTDIR)\apr_strnatcmp.obj" \
-	"$(INTDIR)\apr_strtok.obj" \
-	"$(INTDIR)\apr_hash.obj" \
-	"$(INTDIR)\apr_skiplist.obj" \
-	"$(INTDIR)\apr_tables.obj" \
-	"$(INTDIR)\proc.obj" \
-	"$(INTDIR)\signals.obj" \
-	"$(INTDIR)\thread.obj" \
-	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\time.obj" \
-	"$(INTDIR)\timestr.obj" \
-	"$(INTDIR)\groupinfo.obj" \
-	"$(INTDIR)\userinfo.obj"
-
-"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
-
-OUTDIR=.\9x\LibR
-INTDIR=.\9x\LibR
-# Begin Custom Macros
-OutDir=.\9x\LibR
-# End Custom Macros
-
-ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\apr-1.idb"
-	-@erase "$(INTDIR)\apr-1.pdb"
-	-@erase "$(INTDIR)\apr_atomic.obj"
-	-@erase "$(INTDIR)\apr_cpystrn.obj"
-	-@erase "$(INTDIR)\apr_escape.obj"
-	-@erase "$(INTDIR)\apr_fnmatch.obj"
-	-@erase "$(INTDIR)\apr_getpass.obj"
-	-@erase "$(INTDIR)\apr_hash.obj"
-	-@erase "$(INTDIR)\apr_pools.obj"
-	-@erase "$(INTDIR)\apr_random.obj"
-	-@erase "$(INTDIR)\apr_skiplist.obj"
-	-@erase "$(INTDIR)\apr_snprintf.obj"
-	-@erase "$(INTDIR)\apr_strings.obj"
-	-@erase "$(INTDIR)\apr_strnatcmp.obj"
-	-@erase "$(INTDIR)\apr_strtok.obj"
-	-@erase "$(INTDIR)\apr_tables.obj"
-	-@erase "$(INTDIR)\buffer.obj"
-	-@erase "$(INTDIR)\charset.obj"
-	-@erase "$(INTDIR)\common.obj"
-	-@erase "$(INTDIR)\copy.obj"
-	-@erase "$(INTDIR)\dir.obj"
-	-@erase "$(INTDIR)\dso.obj"
-	-@erase "$(INTDIR)\env.obj"
-	-@erase "$(INTDIR)\errorcodes.obj"
-	-@erase "$(INTDIR)\fileacc.obj"
-	-@erase "$(INTDIR)\filedup.obj"
-	-@erase "$(INTDIR)\filepath.obj"
-	-@erase "$(INTDIR)\filepath_util.obj"
-	-@erase "$(INTDIR)\filestat.obj"
-	-@erase "$(INTDIR)\filesys.obj"
-	-@erase "$(INTDIR)\flock.obj"
-	-@erase "$(INTDIR)\fullrw.obj"
-	-@erase "$(INTDIR)\getopt.obj"
-	-@erase "$(INTDIR)\groupinfo.obj"
-	-@erase "$(INTDIR)\inet_ntop.obj"
-	-@erase "$(INTDIR)\inet_pton.obj"
-	-@erase "$(INTDIR)\internal.obj"
-	-@erase "$(INTDIR)\misc.obj"
-	-@erase "$(INTDIR)\mktemp.obj"
-	-@erase "$(INTDIR)\mmap.obj"
-	-@erase "$(INTDIR)\multicast.obj"
-	-@erase "$(INTDIR)\open.obj"
-	-@erase "$(INTDIR)\otherchild.obj"
-	-@erase "$(INTDIR)\pipe.obj"
-	-@erase "$(INTDIR)\poll.obj"
-	-@erase "$(INTDIR)\pollcb.obj"
-	-@erase "$(INTDIR)\pollset.obj"
-	-@erase "$(INTDIR)\proc.obj"
-	-@erase "$(INTDIR)\proc_mutex.obj"
-	-@erase "$(INTDIR)\rand.obj"
-	-@erase "$(INTDIR)\readwrite.obj"
-	-@erase "$(INTDIR)\seek.obj"
-	-@erase "$(INTDIR)\select.obj"
-	-@erase "$(INTDIR)\sendrecv.obj"
-	-@erase "$(INTDIR)\sha2.obj"
-	-@erase "$(INTDIR)\sha2_glue.obj"
-	-@erase "$(INTDIR)\shm.obj"
-	-@erase "$(INTDIR)\signals.obj"
-	-@erase "$(INTDIR)\sockaddr.obj"
-	-@erase "$(INTDIR)\socket_util.obj"
-	-@erase "$(INTDIR)\sockets.obj"
-	-@erase "$(INTDIR)\sockopt.obj"
-	-@erase "$(INTDIR)\start.obj"
-	-@erase "$(INTDIR)\tempdir.obj"
-	-@erase "$(INTDIR)\thread.obj"
-	-@erase "$(INTDIR)\thread_cond.obj"
-	-@erase "$(INTDIR)\thread_mutex.obj"
-	-@erase "$(INTDIR)\thread_rwlock.obj"
-	-@erase "$(INTDIR)\threadpriv.obj"
-	-@erase "$(INTDIR)\time.obj"
-	-@erase "$(INTDIR)\timestr.obj"
-	-@erase "$(INTDIR)\userinfo.obj"
-	-@erase "$(INTDIR)\utf8.obj"
-	-@erase "$(INTDIR)\version.obj"
-	-@erase "$(OUTDIR)\apr-1.lib"
-	-@erase ".\include\apr.h"
-	-@erase ".\include\apr_gen_test_char.h"
-	-@erase "$(OUTDIR)\gen_test_char.exe"
-	-@erase "$(OUTDIR)\gen_test_char.obj"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\apr_atomic.obj" \
-	"$(INTDIR)\dso.obj" \
-	"$(INTDIR)\apr_escape.obj" \
-	"$(INTDIR)\buffer.obj" \
-	"$(INTDIR)\copy.obj" \
-	"$(INTDIR)\dir.obj" \
-	"$(INTDIR)\fileacc.obj" \
-	"$(INTDIR)\filedup.obj" \
-	"$(INTDIR)\filepath.obj" \
-	"$(INTDIR)\filepath_util.obj" \
-	"$(INTDIR)\filestat.obj" \
-	"$(INTDIR)\filesys.obj" \
-	"$(INTDIR)\flock.obj" \
-	"$(INTDIR)\fullrw.obj" \
-	"$(INTDIR)\mktemp.obj" \
-	"$(INTDIR)\open.obj" \
-	"$(INTDIR)\pipe.obj" \
-	"$(INTDIR)\readwrite.obj" \
-	"$(INTDIR)\seek.obj" \
-	"$(INTDIR)\tempdir.obj" \
-	"$(INTDIR)\proc_mutex.obj" \
-	"$(INTDIR)\thread_cond.obj" \
-	"$(INTDIR)\thread_mutex.obj" \
-	"$(INTDIR)\thread_rwlock.obj" \
-	"$(INTDIR)\apr_pools.obj" \
-	"$(INTDIR)\charset.obj" \
-	"$(INTDIR)\env.obj" \
-	"$(INTDIR)\errorcodes.obj" \
-	"$(INTDIR)\getopt.obj" \
-	"$(INTDIR)\internal.obj" \
-	"$(INTDIR)\misc.obj" \
-	"$(INTDIR)\otherchild.obj" \
-	"$(INTDIR)\rand.obj" \
-	"$(INTDIR)\start.obj" \
-	"$(INTDIR)\utf8.obj" \
-	"$(INTDIR)\version.obj" \
-	"$(INTDIR)\common.obj" \
-	"$(INTDIR)\mmap.obj" \
-	"$(INTDIR)\inet_ntop.obj" \
-	"$(INTDIR)\inet_pton.obj" \
-	"$(INTDIR)\multicast.obj" \
-	"$(INTDIR)\sendrecv.obj" \
-	"$(INTDIR)\sockaddr.obj" \
 	"$(INTDIR)\sockets.obj" \
-	"$(INTDIR)\socket_util.obj" \
 	"$(INTDIR)\sockopt.obj" \
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\poll.obj" \
 	"$(INTDIR)\pollcb.obj" \
 	"$(INTDIR)\pollset.obj" \
 	"$(INTDIR)\select.obj" \
+	"$(INTDIR)\wakeup.obj" \
 	"$(INTDIR)\apr_random.obj" \
 	"$(INTDIR)\sha2.obj" \
 	"$(INTDIR)\sha2_glue.obj" \
 	"$(INTDIR)\shm.obj" \
 	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_cstr.obj" \
 	"$(INTDIR)\apr_fnmatch.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_strings.obj" \
 	"$(INTDIR)\apr_strnatcmp.obj" \
 	"$(INTDIR)\apr_strtok.obj" \
 	"$(INTDIR)\apr_hash.obj" \
 	"$(INTDIR)\apr_skiplist.obj" \
 	"$(INTDIR)\apr_tables.obj" \
 	"$(INTDIR)\proc.obj" \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
 	"$(INTDIR)\userinfo.obj"
 
 "$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
     $(LIB32) @<<
   $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
 <<
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
+!ELSEIF  "$(CFG)" == "apr - x64 Release"
 
-OUTDIR=.\9x\LibD
-INTDIR=.\9x\LibD
+OUTDIR=.\x64\LibR
+INTDIR=.\x64\LibR
 # Begin Custom Macros
-OutDir=.\9x\LibD
+OutDir=.\x64\LibR
 # End Custom Macros
 
-ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\LibD\gen_test_char.exe" "$(OUTDIR)\apr-1.lib"
+ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib"
 
 
 CLEAN :
 	-@erase "$(INTDIR)\apr-1.idb"
 	-@erase "$(INTDIR)\apr-1.pdb"
 	-@erase "$(INTDIR)\apr_atomic.obj"
+	-@erase "$(INTDIR)\apr_atomic64.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
+	-@erase "$(INTDIR)\apr_cstr.obj"
+	-@erase "$(INTDIR)\apr_encode.obj"
 	-@erase "$(INTDIR)\apr_escape.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
 	-@erase "$(INTDIR)\apr_getpass.obj"
 	-@erase "$(INTDIR)\apr_hash.obj"
 	-@erase "$(INTDIR)\apr_pools.obj"
 	-@erase "$(INTDIR)\apr_random.obj"
 	-@erase "$(INTDIR)\apr_skiplist.obj"
 	-@erase "$(INTDIR)\apr_snprintf.obj"
 	-@erase "$(INTDIR)\apr_strings.obj"
 	-@erase "$(INTDIR)\apr_strnatcmp.obj"
 	-@erase "$(INTDIR)\apr_strtok.obj"
 	-@erase "$(INTDIR)\apr_tables.obj"
 	-@erase "$(INTDIR)\buffer.obj"
 	-@erase "$(INTDIR)\charset.obj"
 	-@erase "$(INTDIR)\common.obj"
 	-@erase "$(INTDIR)\copy.obj"
 	-@erase "$(INTDIR)\dir.obj"
 	-@erase "$(INTDIR)\dso.obj"
 	-@erase "$(INTDIR)\env.obj"
 	-@erase "$(INTDIR)\errorcodes.obj"
 	-@erase "$(INTDIR)\fileacc.obj"
 	-@erase "$(INTDIR)\filedup.obj"
 	-@erase "$(INTDIR)\filepath.obj"
 	-@erase "$(INTDIR)\filepath_util.obj"
 	-@erase "$(INTDIR)\filestat.obj"
 	-@erase "$(INTDIR)\filesys.obj"
 	-@erase "$(INTDIR)\flock.obj"
 	-@erase "$(INTDIR)\fullrw.obj"
 	-@erase "$(INTDIR)\getopt.obj"
 	-@erase "$(INTDIR)\groupinfo.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
 	-@erase "$(INTDIR)\inet_pton.obj"
 	-@erase "$(INTDIR)\internal.obj"
 	-@erase "$(INTDIR)\misc.obj"
 	-@erase "$(INTDIR)\mktemp.obj"
 	-@erase "$(INTDIR)\mmap.obj"
 	-@erase "$(INTDIR)\multicast.obj"
 	-@erase "$(INTDIR)\open.obj"
 	-@erase "$(INTDIR)\otherchild.obj"
 	-@erase "$(INTDIR)\pipe.obj"
 	-@erase "$(INTDIR)\poll.obj"
 	-@erase "$(INTDIR)\pollcb.obj"
 	-@erase "$(INTDIR)\pollset.obj"
 	-@erase "$(INTDIR)\proc.obj"
 	-@erase "$(INTDIR)\proc_mutex.obj"
 	-@erase "$(INTDIR)\rand.obj"
 	-@erase "$(INTDIR)\readwrite.obj"
 	-@erase "$(INTDIR)\seek.obj"
 	-@erase "$(INTDIR)\select.obj"
 	-@erase "$(INTDIR)\sendrecv.obj"
 	-@erase "$(INTDIR)\sha2.obj"
 	-@erase "$(INTDIR)\sha2_glue.obj"
 	-@erase "$(INTDIR)\shm.obj"
 	-@erase "$(INTDIR)\signals.obj"
 	-@erase "$(INTDIR)\sockaddr.obj"
 	-@erase "$(INTDIR)\socket_util.obj"
 	-@erase "$(INTDIR)\sockets.obj"
 	-@erase "$(INTDIR)\sockopt.obj"
 	-@erase "$(INTDIR)\start.obj"
 	-@erase "$(INTDIR)\tempdir.obj"
 	-@erase "$(INTDIR)\thread.obj"
 	-@erase "$(INTDIR)\thread_cond.obj"
 	-@erase "$(INTDIR)\thread_mutex.obj"
 	-@erase "$(INTDIR)\thread_rwlock.obj"
 	-@erase "$(INTDIR)\threadpriv.obj"
 	-@erase "$(INTDIR)\time.obj"
 	-@erase "$(INTDIR)\timestr.obj"
 	-@erase "$(INTDIR)\userinfo.obj"
 	-@erase "$(INTDIR)\utf8.obj"
 	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\wakeup.obj"
 	-@erase "$(OUTDIR)\apr-1.lib"
 	-@erase ".\include\apr.h"
-	-@erase ".\include\apr_gen_test_char.h"
-	-@erase "$(OUTDIR)\gen_test_char.exe"
-	-@erase "$(OUTDIR)\gen_test_char.obj"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /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" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" 
 BSC32_SBRS= \
 	
 LIB32=link.exe -lib
 LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" 
 LIB32_OBJS= \
 	"$(INTDIR)\apr_atomic.obj" \
+	"$(INTDIR)\apr_atomic64.obj" \
 	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\apr_encode.obj" \
 	"$(INTDIR)\apr_escape.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\copy.obj" \
 	"$(INTDIR)\dir.obj" \
 	"$(INTDIR)\fileacc.obj" \
 	"$(INTDIR)\filedup.obj" \
 	"$(INTDIR)\filepath.obj" \
 	"$(INTDIR)\filepath_util.obj" \
 	"$(INTDIR)\filestat.obj" \
 	"$(INTDIR)\filesys.obj" \
 	"$(INTDIR)\flock.obj" \
 	"$(INTDIR)\fullrw.obj" \
 	"$(INTDIR)\mktemp.obj" \
 	"$(INTDIR)\open.obj" \
 	"$(INTDIR)\pipe.obj" \
 	"$(INTDIR)\readwrite.obj" \
 	"$(INTDIR)\seek.obj" \
 	"$(INTDIR)\tempdir.obj" \
 	"$(INTDIR)\proc_mutex.obj" \
 	"$(INTDIR)\thread_cond.obj" \
 	"$(INTDIR)\thread_mutex.obj" \
 	"$(INTDIR)\thread_rwlock.obj" \
 	"$(INTDIR)\apr_pools.obj" \
 	"$(INTDIR)\charset.obj" \
 	"$(INTDIR)\env.obj" \
 	"$(INTDIR)\errorcodes.obj" \
 	"$(INTDIR)\getopt.obj" \
 	"$(INTDIR)\internal.obj" \
 	"$(INTDIR)\misc.obj" \
 	"$(INTDIR)\otherchild.obj" \
 	"$(INTDIR)\rand.obj" \
 	"$(INTDIR)\start.obj" \
 	"$(INTDIR)\utf8.obj" \
 	"$(INTDIR)\version.obj" \
 	"$(INTDIR)\common.obj" \
 	"$(INTDIR)\mmap.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
 	"$(INTDIR)\inet_pton.obj" \
 	"$(INTDIR)\multicast.obj" \
 	"$(INTDIR)\sendrecv.obj" \
 	"$(INTDIR)\sockaddr.obj" \
-	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\socket_util.obj" \
+	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\sockopt.obj" \
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\poll.obj" \
 	"$(INTDIR)\pollcb.obj" \
 	"$(INTDIR)\pollset.obj" \
 	"$(INTDIR)\select.obj" \
+	"$(INTDIR)\wakeup.obj" \
 	"$(INTDIR)\apr_random.obj" \
 	"$(INTDIR)\sha2.obj" \
 	"$(INTDIR)\sha2_glue.obj" \
 	"$(INTDIR)\shm.obj" \
 	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_cstr.obj" \
 	"$(INTDIR)\apr_fnmatch.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_strings.obj" \
 	"$(INTDIR)\apr_strnatcmp.obj" \
 	"$(INTDIR)\apr_strtok.obj" \
 	"$(INTDIR)\apr_hash.obj" \
 	"$(INTDIR)\apr_skiplist.obj" \
 	"$(INTDIR)\apr_tables.obj" \
 	"$(INTDIR)\proc.obj" \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
 	"$(INTDIR)\userinfo.obj"
 
 "$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
     $(LIB32) @<<
   $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
 <<
 
-!ELSEIF  "$(CFG)" == "apr - x64 Release"
+!ELSEIF  "$(CFG)" == "apr - x64 Debug"
 
-OUTDIR=.\x64\LibR
-INTDIR=.\x64\LibR
+OUTDIR=.\x64\LibD
+INTDIR=.\x64\LibD
 # Begin Custom Macros
-OutDir=.\x64\LibR
+OutDir=.\x64\LibD
 # End Custom Macros
 
-ALL : ".\x64\LibR\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib"
+ALL : ".\include\apr.h" ".\include\apr_escape.h" "$(OUTDIR)\apr-1.lib"
 
 
 CLEAN :
 	-@erase "$(INTDIR)\apr-1.idb"
 	-@erase "$(INTDIR)\apr-1.pdb"
 	-@erase "$(INTDIR)\apr_atomic.obj"
+	-@erase "$(INTDIR)\apr_atomic64.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
+	-@erase "$(INTDIR)\apr_cstr.obj"
+	-@erase "$(INTDIR)\apr_encode.obj"
 	-@erase "$(INTDIR)\apr_escape.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
 	-@erase "$(INTDIR)\apr_getpass.obj"
 	-@erase "$(INTDIR)\apr_hash.obj"
 	-@erase "$(INTDIR)\apr_pools.obj"
 	-@erase "$(INTDIR)\apr_random.obj"
 	-@erase "$(INTDIR)\apr_skiplist.obj"
 	-@erase "$(INTDIR)\apr_snprintf.obj"
 	-@erase "$(INTDIR)\apr_strings.obj"
 	-@erase "$(INTDIR)\apr_strnatcmp.obj"
 	-@erase "$(INTDIR)\apr_strtok.obj"
 	-@erase "$(INTDIR)\apr_tables.obj"
 	-@erase "$(INTDIR)\buffer.obj"
 	-@erase "$(INTDIR)\charset.obj"
 	-@erase "$(INTDIR)\common.obj"
 	-@erase "$(INTDIR)\copy.obj"
 	-@erase "$(INTDIR)\dir.obj"
 	-@erase "$(INTDIR)\dso.obj"
 	-@erase "$(INTDIR)\env.obj"
 	-@erase "$(INTDIR)\errorcodes.obj"
 	-@erase "$(INTDIR)\fileacc.obj"
 	-@erase "$(INTDIR)\filedup.obj"
 	-@erase "$(INTDIR)\filepath.obj"
 	-@erase "$(INTDIR)\filepath_util.obj"
 	-@erase "$(INTDIR)\filestat.obj"
 	-@erase "$(INTDIR)\filesys.obj"
 	-@erase "$(INTDIR)\flock.obj"
 	-@erase "$(INTDIR)\fullrw.obj"
 	-@erase "$(INTDIR)\getopt.obj"
 	-@erase "$(INTDIR)\groupinfo.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
 	-@erase "$(INTDIR)\inet_pton.obj"
 	-@erase "$(INTDIR)\internal.obj"
 	-@erase "$(INTDIR)\misc.obj"
 	-@erase "$(INTDIR)\mktemp.obj"
 	-@erase "$(INTDIR)\mmap.obj"
 	-@erase "$(INTDIR)\multicast.obj"
 	-@erase "$(INTDIR)\open.obj"
 	-@erase "$(INTDIR)\otherchild.obj"
 	-@erase "$(INTDIR)\pipe.obj"
 	-@erase "$(INTDIR)\poll.obj"
 	-@erase "$(INTDIR)\pollcb.obj"
 	-@erase "$(INTDIR)\pollset.obj"
 	-@erase "$(INTDIR)\proc.obj"
 	-@erase "$(INTDIR)\proc_mutex.obj"
 	-@erase "$(INTDIR)\rand.obj"
 	-@erase "$(INTDIR)\readwrite.obj"
 	-@erase "$(INTDIR)\seek.obj"
 	-@erase "$(INTDIR)\select.obj"
 	-@erase "$(INTDIR)\sendrecv.obj"
 	-@erase "$(INTDIR)\sha2.obj"
 	-@erase "$(INTDIR)\sha2_glue.obj"
 	-@erase "$(INTDIR)\shm.obj"
 	-@erase "$(INTDIR)\signals.obj"
 	-@erase "$(INTDIR)\sockaddr.obj"
 	-@erase "$(INTDIR)\socket_util.obj"
 	-@erase "$(INTDIR)\sockets.obj"
 	-@erase "$(INTDIR)\sockopt.obj"
 	-@erase "$(INTDIR)\start.obj"
 	-@erase "$(INTDIR)\tempdir.obj"
 	-@erase "$(INTDIR)\thread.obj"
 	-@erase "$(INTDIR)\thread_cond.obj"
 	-@erase "$(INTDIR)\thread_mutex.obj"
 	-@erase "$(INTDIR)\thread_rwlock.obj"
 	-@erase "$(INTDIR)\threadpriv.obj"
 	-@erase "$(INTDIR)\time.obj"
 	-@erase "$(INTDIR)\timestr.obj"
 	-@erase "$(INTDIR)\userinfo.obj"
 	-@erase "$(INTDIR)\utf8.obj"
 	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\wakeup.obj"
 	-@erase "$(OUTDIR)\apr-1.lib"
 	-@erase ".\include\apr.h"
-	-@erase ".\include\apr_gen_test_char.h"
-	-@erase "$(OUTDIR)\gen_test_char.exe"
-	-@erase "$(OUTDIR)\gen_test_char.obj"
+	-@erase ".\include\apr_escape_test_char.h"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" 
 BSC32_SBRS= \
 	
 LIB32=link.exe -lib
 LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" 
 LIB32_OBJS= \
 	"$(INTDIR)\apr_atomic.obj" \
+	"$(INTDIR)\apr_atomic64.obj" \
 	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\apr_encode.obj" \
 	"$(INTDIR)\apr_escape.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\copy.obj" \
 	"$(INTDIR)\dir.obj" \
 	"$(INTDIR)\fileacc.obj" \
 	"$(INTDIR)\filedup.obj" \
 	"$(INTDIR)\filepath.obj" \
 	"$(INTDIR)\filepath_util.obj" \
 	"$(INTDIR)\filestat.obj" \
 	"$(INTDIR)\filesys.obj" \
 	"$(INTDIR)\flock.obj" \
 	"$(INTDIR)\fullrw.obj" \
 	"$(INTDIR)\mktemp.obj" \
 	"$(INTDIR)\open.obj" \
 	"$(INTDIR)\pipe.obj" \
 	"$(INTDIR)\readwrite.obj" \
 	"$(INTDIR)\seek.obj" \
 	"$(INTDIR)\tempdir.obj" \
 	"$(INTDIR)\proc_mutex.obj" \
 	"$(INTDIR)\thread_cond.obj" \
 	"$(INTDIR)\thread_mutex.obj" \
 	"$(INTDIR)\thread_rwlock.obj" \
 	"$(INTDIR)\apr_pools.obj" \
 	"$(INTDIR)\charset.obj" \
 	"$(INTDIR)\env.obj" \
 	"$(INTDIR)\errorcodes.obj" \
 	"$(INTDIR)\getopt.obj" \
 	"$(INTDIR)\internal.obj" \
 	"$(INTDIR)\misc.obj" \
 	"$(INTDIR)\otherchild.obj" \
 	"$(INTDIR)\rand.obj" \
 	"$(INTDIR)\start.obj" \
 	"$(INTDIR)\utf8.obj" \
 	"$(INTDIR)\version.obj" \
 	"$(INTDIR)\common.obj" \
 	"$(INTDIR)\mmap.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
 	"$(INTDIR)\inet_pton.obj" \
 	"$(INTDIR)\multicast.obj" \
 	"$(INTDIR)\sendrecv.obj" \
 	"$(INTDIR)\sockaddr.obj" \
-	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\socket_util.obj" \
+	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\sockopt.obj" \
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\poll.obj" \
 	"$(INTDIR)\pollcb.obj" \
 	"$(INTDIR)\pollset.obj" \
 	"$(INTDIR)\select.obj" \
+	"$(INTDIR)\wakeup.obj" \
 	"$(INTDIR)\apr_random.obj" \
 	"$(INTDIR)\sha2.obj" \
 	"$(INTDIR)\sha2_glue.obj" \
 	"$(INTDIR)\shm.obj" \
 	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_cstr.obj" \
 	"$(INTDIR)\apr_fnmatch.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_strings.obj" \
 	"$(INTDIR)\apr_strnatcmp.obj" \
 	"$(INTDIR)\apr_strtok.obj" \
 	"$(INTDIR)\apr_hash.obj" \
 	"$(INTDIR)\apr_skiplist.obj" \
 	"$(INTDIR)\apr_tables.obj" \
 	"$(INTDIR)\proc.obj" \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
 	"$(INTDIR)\userinfo.obj"
 
 "$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
     $(LIB32) @<<
   $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
 <<
 
-!ELSEIF  "$(CFG)" == "apr - x64 Debug"
+!ENDIF 
 
-OUTDIR=.\x64\LibD
-INTDIR=.\x64\LibD
-# Begin Custom Macros
-OutDir=.\x64\LibD
-# End Custom Macros
-
-ALL : ".\x64\LibD\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\apr-1.idb"
-	-@erase "$(INTDIR)\apr-1.pdb"
-	-@erase "$(INTDIR)\apr_atomic.obj"
-	-@erase "$(INTDIR)\apr_cpystrn.obj"
-	-@erase "$(INTDIR)\apr_escape.obj"
-	-@erase "$(INTDIR)\apr_fnmatch.obj"
-	-@erase "$(INTDIR)\apr_getpass.obj"
-	-@erase "$(INTDIR)\apr_hash.obj"
-	-@erase "$(INTDIR)\apr_pools.obj"
-	-@erase "$(INTDIR)\apr_random.obj"
-	-@erase "$(INTDIR)\apr_skiplist.obj"
-	-@erase "$(INTDIR)\apr_snprintf.obj"
-	-@erase "$(INTDIR)\apr_strings.obj"
-	-@erase "$(INTDIR)\apr_strnatcmp.obj"
-	-@erase "$(INTDIR)\apr_strtok.obj"
-	-@erase "$(INTDIR)\apr_tables.obj"
-	-@erase "$(INTDIR)\buffer.obj"
-	-@erase "$(INTDIR)\charset.obj"
-	-@erase "$(INTDIR)\common.obj"
-	-@erase "$(INTDIR)\copy.obj"
-	-@erase "$(INTDIR)\dir.obj"
-	-@erase "$(INTDIR)\dso.obj"
-	-@erase "$(INTDIR)\env.obj"
-	-@erase "$(INTDIR)\errorcodes.obj"
-	-@erase "$(INTDIR)\fileacc.obj"
-	-@erase "$(INTDIR)\filedup.obj"
-	-@erase "$(INTDIR)\filepath.obj"
-	-@erase "$(INTDIR)\filepath_util.obj"
-	-@erase "$(INTDIR)\filestat.obj"
-	-@erase "$(INTDIR)\filesys.obj"
-	-@erase "$(INTDIR)\flock.obj"
-	-@erase "$(INTDIR)\fullrw.obj"
-	-@erase "$(INTDIR)\getopt.obj"
-	-@erase "$(INTDIR)\groupinfo.obj"
-	-@erase "$(INTDIR)\inet_ntop.obj"
-	-@erase "$(INTDIR)\inet_pton.obj"
-	-@erase "$(INTDIR)\internal.obj"
-	-@erase "$(INTDIR)\misc.obj"
-	-@erase "$(INTDIR)\mktemp.obj"
-	-@erase "$(INTDIR)\mmap.obj"
-	-@erase "$(INTDIR)\multicast.obj"
-	-@erase "$(INTDIR)\open.obj"
-	-@erase "$(INTDIR)\otherchild.obj"
-	-@erase "$(INTDIR)\pipe.obj"
-	-@erase "$(INTDIR)\poll.obj"
-	-@erase "$(INTDIR)\pollcb.obj"
-	-@erase "$(INTDIR)\pollset.obj"
-	-@erase "$(INTDIR)\proc.obj"
-	-@erase "$(INTDIR)\proc_mutex.obj"
-	-@erase "$(INTDIR)\rand.obj"
-	-@erase "$(INTDIR)\readwrite.obj"
-	-@erase "$(INTDIR)\seek.obj"
-	-@erase "$(INTDIR)\select.obj"
-	-@erase "$(INTDIR)\sendrecv.obj"
-	-@erase "$(INTDIR)\sha2.obj"
-	-@erase "$(INTDIR)\sha2_glue.obj"
-	-@erase "$(INTDIR)\shm.obj"
-	-@erase "$(INTDIR)\signals.obj"
-	-@erase "$(INTDIR)\sockaddr.obj"
-	-@erase "$(INTDIR)\socket_util.obj"
-	-@erase "$(INTDIR)\sockets.obj"
-	-@erase "$(INTDIR)\sockopt.obj"
-	-@erase "$(INTDIR)\start.obj"
-	-@erase "$(INTDIR)\tempdir.obj"
-	-@erase "$(INTDIR)\thread.obj"
-	-@erase "$(INTDIR)\thread_cond.obj"
-	-@erase "$(INTDIR)\thread_mutex.obj"
-	-@erase "$(INTDIR)\thread_rwlock.obj"
-	-@erase "$(INTDIR)\threadpriv.obj"
-	-@erase "$(INTDIR)\time.obj"
-	-@erase "$(INTDIR)\timestr.obj"
-	-@erase "$(INTDIR)\userinfo.obj"
-	-@erase "$(INTDIR)\utf8.obj"
-	-@erase "$(INTDIR)\version.obj"
-	-@erase "$(OUTDIR)\apr-1.lib"
-	-@erase ".\include\apr.h"
-	-@erase ".\include\apr_gen_test_char.h"
-	-@erase "$(OUTDIR)\gen_test_char.exe"
-	-@erase "$(OUTDIR)\gen_test_char.obj"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\apr-1" /FD /EHsc /c 
-
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\apr-1.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\apr_atomic.obj" \
-	"$(INTDIR)\dso.obj" \
-	"$(INTDIR)\apr_escape.obj" \
-	"$(INTDIR)\buffer.obj" \
-	"$(INTDIR)\copy.obj" \
-	"$(INTDIR)\dir.obj" \
-	"$(INTDIR)\fileacc.obj" \
-	"$(INTDIR)\filedup.obj" \
-	"$(INTDIR)\filepath.obj" \
-	"$(INTDIR)\filepath_util.obj" \
-	"$(INTDIR)\filestat.obj" \
-	"$(INTDIR)\filesys.obj" \
-	"$(INTDIR)\flock.obj" \
-	"$(INTDIR)\fullrw.obj" \
-	"$(INTDIR)\mktemp.obj" \
-	"$(INTDIR)\open.obj" \
-	"$(INTDIR)\pipe.obj" \
-	"$(INTDIR)\readwrite.obj" \
-	"$(INTDIR)\seek.obj" \
-	"$(INTDIR)\tempdir.obj" \
-	"$(INTDIR)\proc_mutex.obj" \
-	"$(INTDIR)\thread_cond.obj" \
-	"$(INTDIR)\thread_mutex.obj" \
-	"$(INTDIR)\thread_rwlock.obj" \
-	"$(INTDIR)\apr_pools.obj" \
-	"$(INTDIR)\charset.obj" \
-	"$(INTDIR)\env.obj" \
-	"$(INTDIR)\errorcodes.obj" \
-	"$(INTDIR)\getopt.obj" \
-	"$(INTDIR)\internal.obj" \
-	"$(INTDIR)\misc.obj" \
-	"$(INTDIR)\otherchild.obj" \
-	"$(INTDIR)\rand.obj" \
-	"$(INTDIR)\start.obj" \
-	"$(INTDIR)\utf8.obj" \
-	"$(INTDIR)\version.obj" \
-	"$(INTDIR)\common.obj" \
-	"$(INTDIR)\mmap.obj" \
-	"$(INTDIR)\inet_ntop.obj" \
-	"$(INTDIR)\inet_pton.obj" \
-	"$(INTDIR)\multicast.obj" \
-	"$(INTDIR)\sendrecv.obj" \
-	"$(INTDIR)\sockaddr.obj" \
-	"$(INTDIR)\sockets.obj" \
-	"$(INTDIR)\socket_util.obj" \
-	"$(INTDIR)\sockopt.obj" \
-	"$(INTDIR)\apr_getpass.obj" \
-	"$(INTDIR)\poll.obj" \
-	"$(INTDIR)\pollcb.obj" \
-	"$(INTDIR)\pollset.obj" \
-	"$(INTDIR)\select.obj" \
-	"$(INTDIR)\apr_random.obj" \
-	"$(INTDIR)\sha2.obj" \
-	"$(INTDIR)\sha2_glue.obj" \
-	"$(INTDIR)\shm.obj" \
-	"$(INTDIR)\apr_cpystrn.obj" \
-	"$(INTDIR)\apr_fnmatch.obj" \
-	"$(INTDIR)\apr_snprintf.obj" \
-	"$(INTDIR)\apr_strings.obj" \
-	"$(INTDIR)\apr_strnatcmp.obj" \
-	"$(INTDIR)\apr_strtok.obj" \
-	"$(INTDIR)\apr_hash.obj" \
-	"$(INTDIR)\apr_skiplist.obj" \
-	"$(INTDIR)\apr_tables.obj" \
-	"$(INTDIR)\proc.obj" \
-	"$(INTDIR)\signals.obj" \
-	"$(INTDIR)\thread.obj" \
-	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\time.obj" \
-	"$(INTDIR)\timestr.obj" \
-	"$(INTDIR)\groupinfo.obj" \
-	"$(INTDIR)\userinfo.obj"
 
-"$(OUTDIR)\apr-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("apr.dep")
 !INCLUDE "apr.dep"
 !ELSE 
 !MESSAGE Warning: cannot find "apr.dep"
 !ENDIF 
 !ENDIF 
 
 
-!IF "$(CFG)" == "apr - Win32 Release" || "$(CFG)" == "apr - Win32 Debug" || "$(CFG)" == "apr - Win32 Release9x" || "$(CFG)" == "apr - Win32 Debug9x" || "$(CFG)" == "apr - x64 Release" || "$(CFG)" == "apr - x64 Debug"
+!IF "$(CFG)" == "apr - Win32 Release" || "$(CFG)" == "apr - Win32 Debug" || "$(CFG)" == "apr - x64 Release" || "$(CFG)" == "apr - x64 Debug"
 SOURCE=.\atomic\win32\apr_atomic.c
 
-"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\atomic\win32\apr_atomic64.c
+
+"$(INTDIR)\apr_atomic64.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\dso\win32\dso.c
 
-"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\encoding\apr_encode.c
+
+"$(INTDIR)\apr_encode.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\encoding\apr_escape.c
 
-"$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_escape.h" ".\include\apr_escape_test_char.h" ".\include\apr.h"
+"$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\buffer.c
 
-"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\copy.c
 
-"$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\dir.c
 
-"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\fileacc.c
 
-"$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filedup.c
 
-"$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filepath.c
 
-"$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\filepath_util.c
 
-"$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filestat.c
 
-"$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filesys.c
 
-"$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\flock.c
 
-"$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\fullrw.c
 
-"$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\mktemp.c
 
-"$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\open.c
 
-"$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\pipe.c
 
-"$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\readwrite.c
 
-"$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\seek.c
 
-"$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\tempdir.c
 
-"$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\proc_mutex.c
 
-"$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_cond.c
 
-"$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_mutex.c
 
-"$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_rwlock.c
 
-"$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\memory\unix\apr_pools.c
 
-"$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\apr_app.c
 SOURCE=.\misc\win32\charset.c
 
-"$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\env.c
 
-"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\errorcodes.c
 
-"$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\getopt.c
 
-"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\internal.c
 
-"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\misc.c
 
-"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\otherchild.c
 
-"$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\rand.c
 
-"$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\start.c
 
-"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\utf8.c
 
-"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\version.c
 
-"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\mmap\unix\common.c
 
-"$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\mmap\win32\mmap.c
 
-"$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\inet_ntop.c
 
-"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\inet_pton.c
 
-"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\multicast.c
 
-"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sendrecv.c
 
-"$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\sockaddr.c
 
-"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\socket_util.c
 
-"$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sockets.c
 
-"$(INTDIR)\sockets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\sockets.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sockopt.c
 
-"$(INTDIR)\sockopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\sockopt.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\passwd\apr_getpass.c
 
-"$(INTDIR)\apr_getpass.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_getpass.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\poll.c
 
-"$(INTDIR)\poll.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\poll.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\pollcb.c
 
-"$(INTDIR)\pollcb.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\pollcb.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\pollset.c
 
-"$(INTDIR)\pollset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\pollset.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\select.c
 
-"$(INTDIR)\select.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\select.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\poll\unix\wakeup.c
+
+"$(INTDIR)\wakeup.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\random\unix\apr_random.c
 
-"$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\random\unix\sha2.c
 
-"$(INTDIR)\sha2.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\sha2.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\random\unix\sha2_glue.c
 
-"$(INTDIR)\sha2_glue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\sha2_glue.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\shmem\win32\shm.c
 
-"$(INTDIR)\shm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\shm.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_cpystrn.c
 
-"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\strings\apr_cstr.c
+
+"$(INTDIR)\apr_cstr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\strings\apr_fnmatch.c
 
-"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_snprintf.c
 
-"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strings.c
 
-"$(INTDIR)\apr_strings.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_strings.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strnatcmp.c
 
-"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strtok.c
 
-"$(INTDIR)\apr_strtok.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_strtok.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\tables\apr_hash.c
 
-"$(INTDIR)\apr_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_hash.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\tables\apr_skiplist.c
 
-"$(INTDIR)\apr_skiplist.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_skiplist.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\tables\apr_tables.c
 
-"$(INTDIR)\apr_tables.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\apr_tables.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\proc.c
 
-"$(INTDIR)\proc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\proc.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\signals.c
 
-"$(INTDIR)\signals.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\signals.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\thread.c
 
-"$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\threadpriv.c
 
-"$(INTDIR)\threadpriv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\threadpriv.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\time\win32\time.c
 
-"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\time\win32\timestr.c
 
-"$(INTDIR)\timestr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\timestr.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\user\win32\groupinfo.c
 
-"$(INTDIR)\groupinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\groupinfo.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\user\win32\userinfo.c
 
-"$(INTDIR)\userinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+"$(INTDIR)\userinfo.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\include\apr.hw
 
 !IF  "$(CFG)" == "apr - Win32 Release"
 
 InputPath=.\include\apr.hw
 
 ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "apr - Win32 Debug"
 
 InputPath=.\include\apr.hw
 
 ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
 << 
 	
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
-
-InputPath=.\include\apr.hw
-
-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
-
-InputPath=.\include\apr.hw
-
-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
 !ELSEIF  "$(CFG)" == "apr - x64 Release"
 
 InputPath=.\include\apr.hw
 
 ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "apr - x64 Debug"
 
 InputPath=.\include\apr.hw
 
 ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
 << 
 	
 
 !ENDIF 
 
 SOURCE=.\include\apr_escape.h
 
 !IF  "$(CFG)" == "apr - Win32 Release"
 
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibR\gen_test_char /Fe.\LibR\gen_test_char.exe .\tools\gen_test_char.c 
-	.\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
+	.\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "apr - Win32 Debug"
 
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\LibD\gen_test_char /Fe.\LibD\gen_test_char.exe .\tools\gen_test_char.c 
-	.\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
+	.\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
 << 
 	
 
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
-
-InputPath=.\include\apr_escape.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibR\gen_test_char /Fe.\9x\LibR\gen_test_char.exe .\tools\gen_test_char.c 
-	.\9x\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
-
-InputPath=.\include\apr_escape.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\LibD\gen_test_char /Fe.\9x\LibD\gen_test_char.exe .\tools\gen_test_char.c 
-	.\9x\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
-<< 
-	
-
 !ELSEIF  "$(CFG)" == "apr - x64 Release"
 
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibR\gen_test_char /Fe.\x64\LibR\gen_test_char.exe .\tools\gen_test_char.c 
-	.\x64\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
+	.\x64\LibR\gen_test_char.exe > .\include\apr_escape_test_char.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "apr - x64 Debug"
 
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\LibD\gen_test_char /Fe.\x64\LibD\gen_test_char.exe .\tools\gen_test_char.c 
-	.\x64\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
-<< 
-	
-
-!ENDIF 
-
-SOURCE=.\include\apr_want.h
-
-!IF  "$(CFG)" == "apr - Win32 Release"
-
-InputPath=.\include\apr_want.h
-
-"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug"
-
-InputPath=.\include\apr_want.h
-
-"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Release9x"
-
-InputPath=.\include\apr_want.h
-
-"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug9x"
-
-InputPath=.\include\apr_want.h
-
-"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "apr - x64 Release"
-
-InputPath=.\include\apr_want.h
-
-"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "apr - x64 Debug"
-
-InputPath=.\include\apr_want.h
-
-"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
+	.\x64\LibD\gen_test_char.exe > .\include\apr_escape_test_char.h
 << 
 	
 
 !ENDIF 
 
 
 !ENDIF 
 
Index: head/contrib/apr/apr.spec
===================================================================
--- head/contrib/apr/apr.spec	(revision 361677)
+++ head/contrib/apr/apr.spec	(revision 361678)
@@ -1,100 +1,100 @@
 
 %define aprver 1
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.5.2
+Version: 1.7.0
 Release: 1
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: autoconf, libtool, doxygen, python
+BuildRequires: autoconf, libtool, doxygen, libuuid-devel, python
 
 %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} all CFLAGS=-fno-strict-aliasing
 make check || 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
 
 # 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 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
 * Sat Aug 30 2008 Graham Leggett <minfrin@sharp.fm> 1.3.3
 - update to depend on the bzip2 binary
 - build depends on python
 
 * 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
 
Index: head/contrib/apr/atomic/unix/builtins64.c
===================================================================
--- head/contrib/apr/atomic/unix/builtins64.c	(nonexistent)
+++ head/contrib/apr/atomic/unix/builtins64.c	(revision 361678)
@@ -0,0 +1,64 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_atomic.h"
+
+#ifdef USE_ATOMICS_BUILTINS
+
+APR_DECLARE(apr_uint64_t) apr_atomic_read64(volatile apr_uint64_t *mem)
+{
+    return *mem;
+}
+
+APR_DECLARE(void) apr_atomic_set64(volatile apr_uint64_t *mem, apr_uint64_t val)
+{
+    *mem = val;
+}
+
+APR_DECLARE(apr_uint64_t) apr_atomic_add64(volatile apr_uint64_t *mem, apr_uint64_t val)
+{
+    return __sync_fetch_and_add(mem, val);
+}
+
+APR_DECLARE(void) apr_atomic_sub64(volatile apr_uint64_t *mem, apr_uint64_t val)
+{
+    __sync_fetch_and_sub(mem, val);
+}
+
+APR_DECLARE(apr_uint64_t) apr_atomic_inc64(volatile apr_uint64_t *mem)
+{
+    return __sync_fetch_and_add(mem, 1);
+}
+
+APR_DECLARE(int) apr_atomic_dec64(volatile apr_uint64_t *mem)
+{
+    return __sync_sub_and_fetch(mem, 1);
+}
+
+APR_DECLARE(apr_uint64_t) apr_atomic_cas64(volatile apr_uint64_t *mem, apr_uint64_t with,
+                                           apr_uint64_t cmp)
+{
+    return __sync_val_compare_and_swap(mem, cmp, with);
+}
+
+APR_DECLARE(apr_uint64_t) apr_atomic_xchg64(volatile apr_uint64_t *mem, apr_uint64_t val)
+{
+    __sync_synchronize();
+
+    return __sync_lock_test_and_set(mem, val);
+}
+
+#endif /* USE_ATOMICS_BUILTINS */

Property changes on: head/contrib/apr/atomic/unix/builtins64.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/apr/atomic/unix/ia32.c
===================================================================
--- head/contrib/apr/atomic/unix/ia32.c	(revision 361677)
+++ head/contrib/apr/atomic/unix/ia32.c	(revision 361678)
@@ -1,127 +1,131 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include "apr_arch_atomic.h"
 
 #ifdef USE_ATOMICS_IA32
 
 APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
 {
+#if defined (NEED_ATOMICS_GENERIC64)
+    return apr__atomic_generic64_init(p);
+#else
     return APR_SUCCESS;
+#endif
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
 {
     return *mem;
 }
 
 APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     *mem = val;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     asm volatile ("lock; xaddl %0,%1"
                   : "=r" (val), "=m" (*mem)
                   : "0" (val), "m" (*mem)
                   : "memory", "cc");
     return val;
 }
 
 APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     asm volatile ("lock; subl %1, %0"
                   : /* no output */
                   : "m" (*(mem)), "r" (val)
                   : "memory", "cc");
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
 {
     return apr_atomic_add32(mem, 1);
 }
 
 APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
 {
     unsigned char prev;
 
     asm volatile ("lock; decl %0; setnz %1"
                   : "=m" (*mem), "=qm" (prev)
                   : "m" (*mem)
                   : "memory");
 
     return prev;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
                                            apr_uint32_t cmp)
 {
     apr_uint32_t prev;
 
     asm volatile ("lock; cmpxchgl %1, %2"
                   : "=a" (prev)
                   : "r" (with), "m" (*(mem)), "0"(cmp)
                   : "memory", "cc");
     return prev;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t prev = val;
 
     asm volatile ("xchgl %0, %1"
                   : "=r" (prev), "+m" (*mem)
                   : "0" (prev));
     return prev;
 }
 
 APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
 {
     void *prev;
 #if APR_SIZEOF_VOIDP == 4
     asm volatile ("lock; cmpxchgl %2, %1"
                   : "=a" (prev), "=m" (*mem)
                   : "r" (with), "m" (*mem), "0" (cmp));
 #elif APR_SIZEOF_VOIDP == 8
     asm volatile ("lock; cmpxchgq %q2, %1"
                   : "=a" (prev), "=m" (*mem)
                   : "r" ((unsigned long)with), "m" (*mem),
                     "0" ((unsigned long)cmp));
 #else
 #error APR_SIZEOF_VOIDP value not supported
 #endif
     return prev;
 }
 
 APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
 {
     void *prev;
 #if APR_SIZEOF_VOIDP == 4
     asm volatile ("xchgl %2, %1"
                   : "=a" (prev), "+m" (*mem)
                   : "0" (with));
 #elif APR_SIZEOF_VOIDP == 8
     asm volatile ("xchgq %q2, %1"
                   : "=a" (prev), "+m" (*mem)
                   : "0" (with));
 #else
 #error APR_SIZEOF_VOIDP value not supported
 #endif
     return prev;
 }
 
 #endif /* USE_ATOMICS_IA32 */
Index: head/contrib/apr/atomic/unix/mutex.c
===================================================================
--- head/contrib/apr/atomic/unix/mutex.c	(revision 361677)
+++ head/contrib/apr/atomic/unix/mutex.c	(revision 361678)
@@ -1,205 +1,206 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include "apr_arch_atomic.h"
+#include "apr_thread_mutex.h"
 
 #ifdef USE_ATOMICS_GENERIC
 
 #include <stdlib.h>
 
 #if APR_HAS_THREADS
 #   define DECLARE_MUTEX_LOCKED(name, mem)  \
         apr_thread_mutex_t *name = mutex_hash(mem)
 #   define MUTEX_UNLOCK(name)                                   \
         do {                                                    \
             if (apr_thread_mutex_unlock(name) != APR_SUCCESS)   \
                 abort();                                        \
         } while (0)
 #else
 #   define DECLARE_MUTEX_LOCKED(name, mem)
 #   define MUTEX_UNLOCK(name)
 #   warning Be warned: using stubs for all atomic operations
 #endif
 
 #if APR_HAS_THREADS
 
 static apr_thread_mutex_t **hash_mutex;
 
 #define NUM_ATOMIC_HASH 7
 /* shift by 2 to get rid of alignment issues */
 #define ATOMIC_HASH(x) (unsigned int)(((unsigned long)(x)>>2)%(unsigned int)NUM_ATOMIC_HASH)
 
 static apr_status_t atomic_cleanup(void *data)
 {
     if (hash_mutex == data)
         hash_mutex = NULL;
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
 {
     int i;
     apr_status_t rv;
 
     if (hash_mutex != NULL)
         return APR_SUCCESS;
 
     hash_mutex = apr_palloc(p, sizeof(apr_thread_mutex_t*) * NUM_ATOMIC_HASH);
     apr_pool_cleanup_register(p, hash_mutex, atomic_cleanup,
                               apr_pool_cleanup_null);
 
     for (i = 0; i < NUM_ATOMIC_HASH; i++) {
         rv = apr_thread_mutex_create(&(hash_mutex[i]),
                                      APR_THREAD_MUTEX_DEFAULT, p);
         if (rv != APR_SUCCESS) {
            return rv;
         }
     }
 
-    return APR_SUCCESS;
+    return apr__atomic_generic64_init(p);
 }
 
 static APR_INLINE apr_thread_mutex_t *mutex_hash(volatile apr_uint32_t *mem)
 {
     apr_thread_mutex_t *mutex = hash_mutex[ATOMIC_HASH(mem)];
 
     if (apr_thread_mutex_lock(mutex) != APR_SUCCESS) {
         abort();
     }
 
     return mutex;
 }
 
 #else
 
 APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
 {
-    return APR_SUCCESS;
+    return apr__atomic_generic64_init(p);
 }
 
 #endif /* APR_HAS_THREADS */
 
 APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
 {
     return *mem;
 }
 
 APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     DECLARE_MUTEX_LOCKED(mutex, mem);
 
     *mem = val;
 
     MUTEX_UNLOCK(mutex);
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t old_value;
     DECLARE_MUTEX_LOCKED(mutex, mem);
 
     old_value = *mem;
     *mem += val;
 
     MUTEX_UNLOCK(mutex);
 
     return old_value;
 }
 
 APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     DECLARE_MUTEX_LOCKED(mutex, mem);
     *mem -= val;
     MUTEX_UNLOCK(mutex);
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
 {
     return apr_atomic_add32(mem, 1);
 }
 
 APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
 {
     apr_uint32_t new;
     DECLARE_MUTEX_LOCKED(mutex, mem);
 
     (*mem)--;
     new = *mem;
 
     MUTEX_UNLOCK(mutex);
 
     return new;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
                               apr_uint32_t cmp)
 {
     apr_uint32_t prev;
     DECLARE_MUTEX_LOCKED(mutex, mem);
 
     prev = *mem;
     if (prev == cmp) {
         *mem = with;
     }
 
     MUTEX_UNLOCK(mutex);
 
     return prev;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t prev;
     DECLARE_MUTEX_LOCKED(mutex, mem);
 
     prev = *mem;
     *mem = val;
 
     MUTEX_UNLOCK(mutex);
 
     return prev;
 }
 
 APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
 {
     void *prev;
     DECLARE_MUTEX_LOCKED(mutex, *mem);
 
     prev = *(void **)mem;
     if (prev == cmp) {
         *mem = with;
     }
 
     MUTEX_UNLOCK(mutex);
 
     return prev;
 }
 
 APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
 {
     void *prev;
     DECLARE_MUTEX_LOCKED(mutex, *mem);
 
     prev = *(void **)mem;
     *mem = with;
 
     MUTEX_UNLOCK(mutex);
 
     return prev;
 }
 
 #endif /* USE_ATOMICS_GENERIC */
Index: head/contrib/apr/atomic/unix/mutex64.c
===================================================================
--- head/contrib/apr/atomic/unix/mutex64.c	(nonexistent)
+++ head/contrib/apr/atomic/unix/mutex64.c	(revision 361678)
@@ -0,0 +1,178 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_atomic.h"
+#include "apr_thread_mutex.h"
+
+#if defined(USE_ATOMICS_GENERIC) || defined (NEED_ATOMICS_GENERIC64)
+
+#include <stdlib.h>
+
+#if APR_HAS_THREADS
+#   define DECLARE_MUTEX_LOCKED(name, mem)  \
+        apr_thread_mutex_t *name = mutex_hash(mem)
+#   define MUTEX_UNLOCK(name)                                   \
+        do {                                                    \
+            if (apr_thread_mutex_unlock(name) != APR_SUCCESS)   \
+                abort();                                        \
+        } while (0)
+#else
+#   define DECLARE_MUTEX_LOCKED(name, mem)
+#   define MUTEX_UNLOCK(name)
+#   warning Be warned: using stubs for all atomic operations
+#endif
+
+#if APR_HAS_THREADS
+
+static apr_thread_mutex_t **hash_mutex;
+
+#define NUM_ATOMIC_HASH 7
+/* shift by 2 to get rid of alignment issues */
+#define ATOMIC_HASH(x) (unsigned int)(((unsigned long)(x)>>2)%(unsigned int)NUM_ATOMIC_HASH)
+
+static apr_status_t atomic_cleanup(void *data)
+{
+    if (hash_mutex == data)
+        hash_mutex = NULL;
+
+    return APR_SUCCESS;
+}
+
+apr_status_t apr__atomic_generic64_init(apr_pool_t *p)
+{
+    int i;
+    apr_status_t rv;
+
+    if (hash_mutex != NULL)
+        return APR_SUCCESS;
+
+    hash_mutex = apr_palloc(p, sizeof(apr_thread_mutex_t*) * NUM_ATOMIC_HASH);
+    apr_pool_cleanup_register(p, hash_mutex, atomic_cleanup,
+                              apr_pool_cleanup_null);
+
+    for (i = 0; i < NUM_ATOMIC_HASH; i++) {
+        rv = apr_thread_mutex_create(&(hash_mutex[i]),
+                                     APR_THREAD_MUTEX_DEFAULT, p);
+        if (rv != APR_SUCCESS) {
+           return rv;
+        }
+    }
+
+    return APR_SUCCESS;
+}
+
+static APR_INLINE apr_thread_mutex_t *mutex_hash(volatile apr_uint64_t *mem)
+{
+    apr_thread_mutex_t *mutex = hash_mutex[ATOMIC_HASH(mem)];
+
+    if (apr_thread_mutex_lock(mutex) != APR_SUCCESS) {
+        abort();
+    }
+
+    return mutex;
+}
+
+#else
+
+apr_status_t apr__atomic_generic64_init(apr_pool_t *p)
+{
+    return APR_SUCCESS;
+}
+
+#endif /* APR_HAS_THREADS */
+
+APR_DECLARE(apr_uint64_t) apr_atomic_read64(volatile apr_uint64_t *mem)
+{
+    return *mem;
+}
+
+APR_DECLARE(void) apr_atomic_set64(volatile apr_uint64_t *mem, apr_uint64_t val)
+{
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+
+    *mem = val;
+
+    MUTEX_UNLOCK(mutex);
+}
+
+APR_DECLARE(apr_uint64_t) apr_atomic_add64(volatile apr_uint64_t *mem, apr_uint64_t val)
+{
+    apr_uint64_t old_value;
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+
+    old_value = *mem;
+    *mem += val;
+
+    MUTEX_UNLOCK(mutex);
+
+    return old_value;
+}
+
+APR_DECLARE(void) apr_atomic_sub64(volatile apr_uint64_t *mem, apr_uint64_t val)
+{
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+    *mem -= val;
+    MUTEX_UNLOCK(mutex);
+}
+
+APR_DECLARE(apr_uint64_t) apr_atomic_inc64(volatile apr_uint64_t *mem)
+{
+    return apr_atomic_add64(mem, 1);
+}
+
+APR_DECLARE(int) apr_atomic_dec64(volatile apr_uint64_t *mem)
+{
+    apr_uint64_t new;
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+
+    (*mem)--;
+    new = *mem;
+
+    MUTEX_UNLOCK(mutex);
+
+    return new;
+}
+
+APR_DECLARE(apr_uint64_t) apr_atomic_cas64(volatile apr_uint64_t *mem, apr_uint64_t with,
+                              apr_uint64_t cmp)
+{
+    apr_uint64_t prev;
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+
+    prev = *mem;
+    if (prev == cmp) {
+        *mem = with;
+    }
+
+    MUTEX_UNLOCK(mutex);
+
+    return prev;
+}
+
+APR_DECLARE(apr_uint64_t) apr_atomic_xchg64(volatile apr_uint64_t *mem, apr_uint64_t val)
+{
+    apr_uint64_t prev;
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+
+    prev = *mem;
+    *mem = val;
+
+    MUTEX_UNLOCK(mutex);
+
+    return prev;
+}
+
+#endif /* USE_ATOMICS_GENERIC64 */

Property changes on: head/contrib/apr/atomic/unix/mutex64.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/apr/atomic/unix/ppc.c
===================================================================
--- head/contrib/apr/atomic/unix/ppc.c	(revision 361677)
+++ head/contrib/apr/atomic/unix/ppc.c	(revision 361678)
@@ -1,207 +1,211 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include "apr_arch_atomic.h"
 
 #ifdef USE_ATOMICS_PPC
 
 #ifdef PPC405_ERRATA
 #   define PPC405_ERR77_SYNC   "    sync\n"
 #else
 #   define PPC405_ERR77_SYNC
 #endif
 
 APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
 {
+#if defined (NEED_ATOMICS_GENERIC64)
+    return apr__atomic_generic64_init(p);
+#else
     return APR_SUCCESS;
+#endif
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
 {
     return *mem;
 }
 
 APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     *mem = val;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t prev, temp;
 
     asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%3\n"      /* load and reserve     */
                   "    add     %1,%0,%4\n"     /* add val and prev     */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %1,0,%3\n"      /* store new value      */
                   "    bne-    1b\n"           /* loop if lost         */
                   : "=&r" (prev), "=&r" (temp), "=m" (*mem)
                   : "b" (mem), "r" (val)
                   : "cc", "memory");
 
     return prev;
 }
 
 APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t temp;
 
     asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%2\n"      /* load and reserve     */
                   "    subf    %0,%3,%0\n"     /* subtract val         */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %0,0,%2\n"      /* store new value      */
                   "    bne-    1b\n"           /* loop if lost         */
                   : "=&r" (temp), "=m" (*mem)
                   : "b" (mem), "r" (val)
                   : "cc", "memory");
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
 {
     apr_uint32_t prev;
 
     asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%2\n"      /* load and reserve     */
                   "    addi    %0,%0,1\n"      /* add immediate        */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %0,0,%2\n"      /* store new value      */
                   "    bne-    1b\n"           /* loop if lost         */
                   "    subi    %0,%0,1\n"      /* return old value     */
                   : "=&b" (prev), "=m" (*mem)
                   : "b" (mem), "m" (*mem)
                   : "cc", "memory");
 
     return prev;
 }
 
 APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
 {
     apr_uint32_t prev;
 
     asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%2\n"      /* load and reserve     */
                   "    subi    %0,%0,1\n"      /* subtract immediate   */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %0,0,%2\n"      /* store new value      */
                   "    bne-    1b\n"           /* loop if lost         */
                   : "=&b" (prev), "=m" (*mem)
                   : "b" (mem), "m" (*mem)
                   : "cc", "memory");
 
     return prev;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
                                            apr_uint32_t cmp)
 {
     apr_uint32_t prev;
 
     asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%1\n"      /* load and reserve     */
                   "    cmpw    %0,%3\n"        /* compare operands     */
                   "    bne-    exit_%=\n"      /* skip if not equal    */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %2,0,%1\n"      /* store new value      */
                   "    bne-    1b\n"           /* loop if lost         */
                   "exit_%=:\n"                 /* not equal            */
                   : "=&r" (prev)
                   : "b" (mem), "r" (with), "r" (cmp)
                   : "cc", "memory");
 
     return prev;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t prev;
 
     asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%1\n"      /* load and reserve     */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %2,0,%1\n"      /* store new value      */
                   "    bne-    1b"             /* loop if lost         */
                   : "=&r" (prev)
                   : "b" (mem), "r" (val)
                   : "cc", "memory");
 
     return prev;
 }
 
 APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
 {
     void *prev;
 #if APR_SIZEOF_VOIDP == 4
     asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%1\n"      /* load and reserve     */
                   "    cmpw    %0,%3\n"        /* compare operands     */
                   "    bne-    2f\n"           /* skip if not equal    */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %2,0,%1\n"      /* store new value      */
                   "    bne-    1b\n"           /* loop if lost         */
                   "2:\n"                       /* not equal            */
                   : "=&r" (prev)
                   : "b" (mem), "r" (with), "r" (cmp)
                   : "cc", "memory");
 #elif APR_SIZEOF_VOIDP == 8
     asm volatile ("1:\n"                       /* lost reservation     */
                   "    ldarx   %0,0,%1\n"      /* load and reserve     */
                   "    cmpd    %0,%3\n"        /* compare operands     */
                   "    bne-    2f\n"           /* skip if not equal    */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stdcx.  %2,0,%1\n"      /* store new value      */
                   "    bne-    1b\n"           /* loop if lost         */
                   "2:\n"                       /* not equal            */
                   : "=&r" (prev)
                   : "b" (mem), "r" (with), "r" (cmp)
                   : "cc", "memory");
 #else
 #error APR_SIZEOF_VOIDP value not supported
 #endif
     return prev;
 }
 
 APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
 {
     void *prev;
 #if APR_SIZEOF_VOIDP == 4
     asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%1\n"      /* load and reserve     */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %2,0,%1\n"      /* store new value      */
                   "    bne-    1b\n"           /* loop if lost         */
                   "    isync\n"                /* memory barrier       */
                   : "=&r" (prev)
                   : "b" (mem), "r" (with)
                   : "cc", "memory");
 #elif APR_SIZEOF_VOIDP == 8
     asm volatile ("1:\n"                       /* lost reservation     */
                   "    ldarx   %0,0,%1\n"      /* load and reserve     */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stdcx.  %2,0,%1\n"      /* store new value      */
                   "    bne-    1b\n"           /* loop if lost         */
                   "    isync\n"                /* memory barrier       */
                   : "=&r" (prev)
                   : "b" (mem), "r" (with)
                   : "cc", "memory");
 #else
 #error APR_SIZEOF_VOIDP value not supported
 #endif
     return prev;
 }
 
 #endif /* USE_ATOMICS_PPC */
Index: head/contrib/apr/atomic/unix/s390.c
===================================================================
--- head/contrib/apr/atomic/unix/s390.c	(revision 361677)
+++ head/contrib/apr/atomic/unix/s390.c	(revision 361678)
@@ -1,155 +1,159 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include "apr_arch_atomic.h"
 
 #ifdef USE_ATOMICS_S390
 
 APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
 {
+#if defined (NEED_ATOMICS_GENERIC64)
+    return apr__atomic_generic64_init(p);
+#else
     return APR_SUCCESS;
+#endif
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
 {
     return *mem;
 }
 
 APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     *mem = val;
 }
 
 static APR_INLINE apr_uint32_t atomic_add(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t prev = *mem, temp;
 
     asm volatile ("loop_%=:\n"
                   "    lr  %1,%0\n"
                   "    alr %1,%3\n"
                   "    cs  %0,%1,%2\n"
                   "    jl  loop_%=\n"
                   : "+d" (prev), "+d" (temp), "=Q" (*mem)
                   : "d" (val), "m" (*mem)
                   : "cc", "memory");
 
     return prev;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     return atomic_add(mem, val);
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
 {
     return atomic_add(mem, 1);
 }
 
 static APR_INLINE apr_uint32_t atomic_sub(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t prev = *mem, temp;
 
     asm volatile ("loop_%=:\n"
                   "    lr  %1,%0\n"
                   "    slr %1,%3\n"
                   "    cs  %0,%1,%2\n"
                   "    jl  loop_%=\n"
                   : "+d" (prev), "+d" (temp), "=Q" (*mem)
                   : "d" (val), "m" (*mem)
                   : "cc", "memory");
 
     return temp;
 }
 
 APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     atomic_sub(mem, val);
 }
 
 APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
 {
     return atomic_sub(mem, 1);
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
                                            apr_uint32_t cmp)
 {
     asm volatile ("    cs  %0,%2,%1\n"
                   : "+d" (cmp), "=Q" (*mem)
                   : "d" (with), "m" (*mem)
                   : "cc", "memory");
 
     return cmp;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t prev = *mem;
 
     asm volatile ("loop_%=:\n"
                   "    cs  %0,%2,%1\n"
                   "    jl  loop_%=\n"
                   : "+d" (prev), "=Q" (*mem)
                   : "d" (val), "m" (*mem)
                   : "cc", "memory");
 
     return prev;
 }
 
 APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
 {
     void *prev = (void *) cmp;
 #if APR_SIZEOF_VOIDP == 4
     asm volatile ("    cs  %0,%2,%1\n"
                   : "+d" (prev), "=Q" (*mem)
                   : "d" (with), "m" (*mem)
                   : "cc", "memory");
 #elif APR_SIZEOF_VOIDP == 8
     asm volatile ("    csg %0,%2,%1\n"
                   : "+d" (prev), "=Q" (*mem)
                   : "d" (with), "m" (*mem)
                   : "cc", "memory");
 #else
 #error APR_SIZEOF_VOIDP value not supported
 #endif
     return prev;
 }
 
 APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
 {
     void *prev = (void *) *mem;
 #if APR_SIZEOF_VOIDP == 4
     asm volatile ("loop_%=:\n"
                   "    cs  %0,%2,%1\n"
                   "    jl  loop_%=\n"
                   : "+d" (prev), "=Q" (*mem)
                   : "d" (with), "m" (*mem)
                   : "cc", "memory");
 #elif APR_SIZEOF_VOIDP == 8
     asm volatile ("loop_%=:\n"
                   "    csg %0,%2,%1\n"
                   "    jl  loop_%=\n"
                   : "+d" (prev), "=Q" (*mem)
                   : "d" (with), "m" (*mem)
                   : "cc", "memory");
 #else
 #error APR_SIZEOF_VOIDP value not supported
 #endif
     return prev;
 }
 
 #endif /* USE_ATOMICS_S390 */
Index: head/contrib/apr/atomic/unix/solaris.c
===================================================================
--- head/contrib/apr/atomic/unix/solaris.c	(revision 361677)
+++ head/contrib/apr/atomic/unix/solaris.c	(revision 361678)
@@ -1,79 +1,83 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include "apr_arch_atomic.h"
 
 #ifdef USE_ATOMICS_SOLARIS
 
 #include <atomic.h>
 
 APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
 {
+#if defined (NEED_ATOMICS_GENERIC64)
+    return apr__atomic_generic64_init(p);
+#else
     return APR_SUCCESS;
+#endif
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
 {
     return *mem;
 }
 
 APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     *mem = val;
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     return atomic_add_32_nv(mem, val) - val;
 }
 
 APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     atomic_add_32(mem, -val);
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
 {
     return atomic_inc_32_nv(mem) - 1;
 }
 
 APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
 {
     return atomic_dec_32_nv(mem);
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
                                            apr_uint32_t cmp)
 {
     return atomic_cas_32(mem, cmp, with);
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
     return atomic_swap_32(mem, val);
 }
 
 APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
 {
     return atomic_cas_ptr(mem, (void*) cmp, with);
 }
 
 APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
 {
     return atomic_swap_ptr(mem, with);
 }
 
 #endif /* USE_ATOMICS_SOLARIS */
Index: head/contrib/apr/build-outputs.mk
===================================================================
--- head/contrib/apr/build-outputs.mk	(revision 361677)
+++ head/contrib/apr/build-outputs.mk	(revision 361678)
@@ -1,322 +1,328 @@
 # DO NOT EDIT. AUTOMATICALLY GENERATED.
 
-encoding/apr_escape.lo: encoding/apr_escape.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_escape.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
-passwd/apr_getpass.lo: passwd/apr_getpass.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
-strings/apr_cpystrn.lo: strings/apr_cpystrn.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+encoding/apr_encode.lo: encoding/apr_encode.c .make.dirs include/apr_allocator.h include/apr_encode.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+encoding/apr_escape.lo: encoding/apr_escape.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_escape.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+passwd/apr_getpass.lo: passwd/apr_getpass.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+strings/apr_cpystrn.lo: strings/apr_cpystrn.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+strings/apr_cstr.lo: strings/apr_cstr.c .make.dirs include/apr_allocator.h include/apr_cstr.h include/apr_errno.h include/apr_fnmatch.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 strings/apr_fnmatch.lo: strings/apr_fnmatch.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_fnmatch.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-strings/apr_snprintf.lo: strings/apr_snprintf.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-strings/apr_strings.lo: strings/apr_strings.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
-strings/apr_strnatcmp.lo: strings/apr_strnatcmp.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
-strings/apr_strtok.lo: strings/apr_strtok.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+strings/apr_snprintf.lo: strings/apr_snprintf.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+strings/apr_strings.lo: strings/apr_strings.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+strings/apr_strnatcmp.lo: strings/apr_strnatcmp.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+strings/apr_strtok.lo: strings/apr_strtok.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 tables/apr_hash.lo: tables/apr_hash.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_hash.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
-tables/apr_skiplist.lo: tables/apr_skiplist.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_skiplist.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-tables/apr_tables.lo: tables/apr_tables.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_want.h
+tables/apr_skiplist.lo: tables/apr_skiplist.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_skiplist.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+tables/apr_tables.lo: tables/apr_tables.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 
-OBJECTS_all = encoding/apr_escape.lo passwd/apr_getpass.lo strings/apr_cpystrn.lo strings/apr_fnmatch.lo strings/apr_snprintf.lo strings/apr_strings.lo strings/apr_strnatcmp.lo strings/apr_strtok.lo tables/apr_hash.lo tables/apr_skiplist.lo tables/apr_tables.lo
+OBJECTS_all = encoding/apr_encode.lo encoding/apr_escape.lo passwd/apr_getpass.lo strings/apr_cpystrn.lo strings/apr_cstr.lo strings/apr_fnmatch.lo strings/apr_snprintf.lo strings/apr_strings.lo strings/apr_strnatcmp.lo strings/apr_strtok.lo tables/apr_hash.lo tables/apr_skiplist.lo tables/apr_tables.lo
 
-dso/unix/dso.lo: dso/unix/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+dso/unix/dso.lo: dso/unix/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_dso_unix = dso/unix/dso.lo
 
-file_io/unix/buffer.lo: file_io/unix/buffer.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_want.h
+file_io/unix/buffer.lo: file_io/unix/buffer.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 file_io/unix/copy.lo: file_io/unix/copy.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/unix/dir.lo: file_io/unix/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/unix/fileacc.lo: file_io/unix/fileacc.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
-file_io/unix/filedup.lo: file_io/unix/filedup.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/unix/dir.lo: file_io/unix/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/unix/fileacc.lo: file_io/unix/fileacc.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+file_io/unix/filedup.lo: file_io/unix/filedup.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/unix/filepath.lo: file_io/unix/filepath.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/unix/filepath_util.lo: file_io/unix/filepath_util.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_want.h
+file_io/unix/filepath_util.lo: file_io/unix/filepath_util.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 file_io/unix/filestat.lo: file_io/unix/filestat.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/unix/flock.lo: file_io/unix/flock.c .make.dirs 
 file_io/unix/fullrw.lo: file_io/unix/fullrw.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/unix/mktemp.lo: file_io/unix/mktemp.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/unix/open.lo: file_io/unix/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/unix/pipe.lo: file_io/unix/pipe.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/unix/readwrite.lo: file_io/unix/readwrite.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_strings.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/unix/mktemp.lo: file_io/unix/mktemp.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/unix/open.lo: file_io/unix/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/unix/pipe.lo: file_io/unix/pipe.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/unix/readwrite.lo: file_io/unix/readwrite.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_strings.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/unix/seek.lo: file_io/unix/seek.c .make.dirs 
 file_io/unix/tempdir.lo: file_io/unix/tempdir.c .make.dirs include/apr_allocator.h include/apr_env.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_file_io_unix = file_io/unix/buffer.lo file_io/unix/copy.lo file_io/unix/dir.lo file_io/unix/fileacc.lo file_io/unix/filedup.lo file_io/unix/filepath.lo file_io/unix/filepath_util.lo file_io/unix/filestat.lo file_io/unix/flock.lo file_io/unix/fullrw.lo file_io/unix/mktemp.lo file_io/unix/open.lo file_io/unix/pipe.lo file_io/unix/readwrite.lo file_io/unix/seek.lo file_io/unix/tempdir.lo
 
-locks/unix/global_mutex.lo: locks/unix/global_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-locks/unix/proc_mutex.lo: locks/unix/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_hash.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+locks/unix/global_mutex.lo: locks/unix/global_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/unix/proc_mutex.lo: locks/unix/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_errno.h include/apr_general.h include/apr_hash.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 locks/unix/thread_cond.lo: locks/unix/thread_cond.c .make.dirs 
 locks/unix/thread_mutex.lo: locks/unix/thread_mutex.c .make.dirs include/apr_want.h
 locks/unix/thread_rwlock.lo: locks/unix/thread_rwlock.c .make.dirs 
 
 OBJECTS_locks_unix = locks/unix/global_mutex.lo locks/unix/proc_mutex.lo locks/unix/thread_cond.lo locks/unix/thread_mutex.lo locks/unix/thread_rwlock.lo
 
-memory/unix/apr_pools.lo: memory/unix/apr_pools.c .make.dirs include/apr_allocator.h include/apr_atomic.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_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+memory/unix/apr_pools.lo: memory/unix/apr_pools.c .make.dirs include/apr_allocator.h include/apr_atomic.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_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_memory_unix = memory/unix/apr_pools.lo
 
-misc/unix/charset.lo: misc/unix/charset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-misc/unix/env.lo: misc/unix/env.c .make.dirs include/apr_allocator.h include/apr_env.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
-misc/unix/errorcodes.lo: misc/unix/errorcodes.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
-misc/unix/getopt.lo: misc/unix/getopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+misc/unix/charset.lo: misc/unix/charset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+misc/unix/env.lo: misc/unix/env.c .make.dirs include/apr_allocator.h include/apr_env.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+misc/unix/errorcodes.lo: misc/unix/errorcodes.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+misc/unix/getopt.lo: misc/unix/getopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 misc/unix/otherchild.lo: misc/unix/otherchild.c .make.dirs 
-misc/unix/rand.lo: misc/unix/rand.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_want.h
-misc/unix/start.lo: misc/unix/start.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_signal.h include/apr_thread_mutex.h include/apr_want.h
-misc/unix/version.lo: misc/unix/version.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_version.h include/apr_want.h
+misc/unix/rand.lo: misc/unix/rand.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+misc/unix/start.lo: misc/unix/start.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_signal.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+misc/unix/version.lo: misc/unix/version.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_version.h include/apr_want.h
 
 OBJECTS_misc_unix = misc/unix/charset.lo misc/unix/env.lo misc/unix/errorcodes.lo misc/unix/getopt.lo misc/unix/otherchild.lo misc/unix/rand.lo misc/unix/start.lo misc/unix/version.lo
 
 mmap/unix/common.lo: mmap/unix/common.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_mmap.h include/apr_pools.h include/apr_ring.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-mmap/unix/mmap.lo: mmap/unix/mmap.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_mmap.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_ring.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+mmap/unix/mmap.lo: mmap/unix/mmap.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_mmap.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_ring.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_mmap_unix = mmap/unix/common.lo mmap/unix/mmap.lo
 
-network_io/unix/inet_ntop.lo: network_io/unix/inet_ntop.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+network_io/unix/inet_ntop.lo: network_io/unix/inet_ntop.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 network_io/unix/inet_pton.lo: network_io/unix/inet_pton.c .make.dirs 
-network_io/unix/multicast.lo: network_io/unix/multicast.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-network_io/unix/sendrecv.lo: network_io/unix/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-network_io/unix/sockaddr.lo: network_io/unix/sockaddr.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
-network_io/unix/socket_util.lo: network_io/unix/socket_util.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-network_io/unix/sockets.lo: network_io/unix/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-network_io/unix/sockopt.lo: network_io/unix/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+network_io/unix/multicast.lo: network_io/unix/multicast.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/unix/sendrecv.lo: network_io/unix/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/unix/sockaddr.lo: network_io/unix/sockaddr.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+network_io/unix/socket_util.lo: network_io/unix/socket_util.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/unix/sockets.lo: network_io/unix/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/unix/sockopt.lo: network_io/unix/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 
 OBJECTS_network_io_unix = network_io/unix/inet_ntop.lo network_io/unix/inet_pton.lo network_io/unix/multicast.lo network_io/unix/sendrecv.lo network_io/unix/sockaddr.lo network_io/unix/socket_util.lo network_io/unix/sockets.lo network_io/unix/sockopt.lo
 
-poll/unix/epoll.lo: poll/unix/epoll.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.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_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-poll/unix/kqueue.lo: poll/unix/kqueue.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.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_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-poll/unix/poll.lo: poll/unix/poll.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.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_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-poll/unix/pollcb.lo: poll/unix/pollcb.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.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_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-poll/unix/pollset.lo: poll/unix/pollset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.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_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-poll/unix/port.lo: poll/unix/port.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.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_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-poll/unix/select.lo: poll/unix/select.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.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_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-poll/unix/z_asio.lo: poll/unix/z_asio.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.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_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/unix/epoll.lo: poll/unix/epoll.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/unix/kqueue.lo: poll/unix/kqueue.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/unix/poll.lo: poll/unix/poll.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/unix/pollcb.lo: poll/unix/pollcb.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/unix/pollset.lo: poll/unix/pollset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/unix/port.lo: poll/unix/port.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/unix/select.lo: poll/unix/select.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/unix/wakeup.lo: poll/unix/wakeup.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/unix/z_asio.lo: poll/unix/z_asio.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_hash.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
-OBJECTS_poll_unix = poll/unix/epoll.lo poll/unix/kqueue.lo poll/unix/poll.lo poll/unix/pollcb.lo poll/unix/pollset.lo poll/unix/port.lo poll/unix/select.lo poll/unix/z_asio.lo
+OBJECTS_poll_unix = poll/unix/epoll.lo poll/unix/kqueue.lo poll/unix/poll.lo poll/unix/pollcb.lo poll/unix/pollset.lo poll/unix/port.lo poll/unix/select.lo poll/unix/wakeup.lo poll/unix/z_asio.lo
 
-random/unix/apr_random.lo: random/unix/apr_random.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_random.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+random/unix/apr_random.lo: random/unix/apr_random.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_perms_set.h include/apr_pools.h include/apr_random.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 random/unix/sha2.lo: random/unix/sha2.c .make.dirs 
-random/unix/sha2_glue.lo: random/unix/sha2_glue.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_random.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+random/unix/sha2_glue.lo: random/unix/sha2_glue.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_perms_set.h include/apr_pools.h include/apr_random.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_random_unix = random/unix/apr_random.lo random/unix/sha2.lo random/unix/sha2_glue.lo
 
-shmem/unix/shm.lo: shmem/unix/shm.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_hash.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_user.h include/apr_want.h
+shmem/unix/shm.lo: shmem/unix/shm.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_hash.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_shmem_unix = shmem/unix/shm.lo
 
-support/unix/waitio.lo: support/unix/waitio.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+support/unix/waitio.lo: support/unix/waitio.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_support_unix = support/unix/waitio.lo
 
-threadproc/unix/proc.lo: threadproc/unix/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_random.h include/apr_shm.h include/apr_signal.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/unix/proc.lo: threadproc/unix/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_random.h include/apr_shm.h include/apr_signal.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 threadproc/unix/procsup.lo: threadproc/unix/procsup.c .make.dirs 
-threadproc/unix/signals.lo: threadproc/unix/signals.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_signal.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
-threadproc/unix/thread.lo: threadproc/unix/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-threadproc/unix/threadpriv.lo: threadproc/unix/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/unix/signals.lo: threadproc/unix/signals.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_signal.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+threadproc/unix/thread.lo: threadproc/unix/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/unix/threadpriv.lo: threadproc/unix/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_threadproc_unix = threadproc/unix/proc.lo threadproc/unix/procsup.lo threadproc/unix/signals.lo threadproc/unix/thread.lo threadproc/unix/threadpriv.lo
 
-time/unix/time.lo: time/unix/time.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-time/unix/timestr.lo: time/unix/timestr.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+time/unix/time.lo: time/unix/time.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+time/unix/timestr.lo: time/unix/timestr.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_time_unix = time/unix/time.lo time/unix/timestr.lo
 
-user/unix/groupinfo.lo: user/unix/groupinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-user/unix/userinfo.lo: user/unix/userinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+user/unix/groupinfo.lo: user/unix/groupinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+user/unix/userinfo.lo: user/unix/userinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_user_unix = user/unix/groupinfo.lo user/unix/userinfo.lo
 
 atomic/unix/builtins.lo: atomic/unix/builtins.c .make.dirs 
+atomic/unix/builtins64.lo: atomic/unix/builtins64.c .make.dirs 
 atomic/unix/ia32.lo: atomic/unix/ia32.c .make.dirs 
-atomic/unix/mutex.lo: atomic/unix/mutex.c .make.dirs 
+atomic/unix/mutex.lo: atomic/unix/mutex.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+atomic/unix/mutex64.lo: atomic/unix/mutex64.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 atomic/unix/ppc.lo: atomic/unix/ppc.c .make.dirs 
 atomic/unix/s390.lo: atomic/unix/s390.c .make.dirs 
 atomic/unix/solaris.lo: atomic/unix/solaris.c .make.dirs 
 
-OBJECTS_atomic_unix = atomic/unix/builtins.lo atomic/unix/ia32.lo atomic/unix/mutex.lo atomic/unix/ppc.lo atomic/unix/s390.lo atomic/unix/solaris.lo
+OBJECTS_atomic_unix = atomic/unix/builtins.lo atomic/unix/builtins64.lo atomic/unix/ia32.lo atomic/unix/mutex.lo atomic/unix/mutex64.lo atomic/unix/ppc.lo atomic/unix/s390.lo atomic/unix/solaris.lo
 
 OBJECTS_unix = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_unix) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix)
 
-dso/aix/dso.lo: dso/aix/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+dso/aix/dso.lo: dso/aix/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_dso_aix = dso/aix/dso.lo
 
 OBJECTS_aix = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_aix) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix)
 
-dso/beos/dso.lo: dso/beos/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+dso/beos/dso.lo: dso/beos/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_dso_beos = dso/beos/dso.lo
 
-locks/beos/proc_mutex.lo: locks/beos/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-locks/beos/thread_cond.lo: locks/beos/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-locks/beos/thread_mutex.lo: locks/beos/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-locks/beos/thread_rwlock.lo: locks/beos/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/beos/proc_mutex.lo: locks/beos/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/beos/thread_cond.lo: locks/beos/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/beos/thread_mutex.lo: locks/beos/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/beos/thread_rwlock.lo: locks/beos/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_locks_beos = locks/beos/proc_mutex.lo locks/beos/thread_cond.lo locks/beos/thread_mutex.lo locks/beos/thread_rwlock.lo
 
 network_io/beos/sendrecv.lo: network_io/beos/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 network_io/beos/socketcommon.lo: network_io/beos/socketcommon.c .make.dirs 
 
 OBJECTS_network_io_beos = network_io/beos/sendrecv.lo network_io/beos/socketcommon.lo
 
-shmem/beos/shm.lo: shmem/beos/shm.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+shmem/beos/shm.lo: shmem/beos/shm.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_shmem_beos = shmem/beos/shm.lo
 
 threadproc/beos/apr_proc_stub.lo: threadproc/beos/apr_proc_stub.c .make.dirs 
-threadproc/beos/proc.lo: threadproc/beos/proc.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
-threadproc/beos/thread.lo: threadproc/beos/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/beos/proc.lo: threadproc/beos/proc.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+threadproc/beos/thread.lo: threadproc/beos/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 threadproc/beos/threadpriv.lo: threadproc/beos/threadpriv.c .make.dirs 
 threadproc/beos/threadproc_common.lo: threadproc/beos/threadproc_common.c .make.dirs 
 
 OBJECTS_threadproc_beos = threadproc/beos/apr_proc_stub.lo threadproc/beos/proc.lo threadproc/beos/thread.lo threadproc/beos/threadpriv.lo threadproc/beos/threadproc_common.lo
 
 OBJECTS_beos = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_beos) $(OBJECTS_file_io_unix) $(OBJECTS_locks_beos) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_beos) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_beos) $(OBJECTS_support_unix) $(OBJECTS_threadproc_beos) $(OBJECTS_time_unix) $(OBJECTS_user_unix)
 
-dso/os2/dso.lo: dso/os2/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+dso/os2/dso.lo: dso/os2/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_dso_os2 = dso/os2/dso.lo
 
-file_io/os2/buffer.lo: file_io/os2/buffer.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_want.h
+file_io/os2/buffer.lo: file_io/os2/buffer.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 file_io/os2/copy.lo: file_io/os2/copy.c .make.dirs 
-file_io/os2/dir.lo: file_io/os2/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/os2/dir.lo: file_io/os2/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/os2/dir_make_recurse.lo: file_io/os2/dir_make_recurse.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/os2/fileacc.lo: file_io/os2/fileacc.c .make.dirs 
 file_io/os2/filedup.lo: file_io/os2/filedup.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/os2/filepath.lo: file_io/os2/filepath.c .make.dirs 
 file_io/os2/filepath_util.lo: file_io/os2/filepath_util.c .make.dirs 
 file_io/os2/filestat.lo: file_io/os2/filestat.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/os2/filesys.lo: file_io/os2/filesys.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+file_io/os2/filesys.lo: file_io/os2/filesys.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 file_io/os2/flock.lo: file_io/os2/flock.c .make.dirs 
 file_io/os2/fullrw.lo: file_io/os2/fullrw.c .make.dirs 
 file_io/os2/maperrorcode.lo: file_io/os2/maperrorcode.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/os2/mktemp.lo: file_io/os2/mktemp.c .make.dirs 
-file_io/os2/open.lo: file_io/os2/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/os2/pipe.lo: file_io/os2/pipe.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/os2/open.lo: file_io/os2/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/os2/pipe.lo: file_io/os2/pipe.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/os2/readwrite.lo: file_io/os2/readwrite.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/os2/seek.lo: file_io/os2/seek.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/os2/tempdir.lo: file_io/os2/tempdir.c .make.dirs 
 
 OBJECTS_file_io_os2 = file_io/os2/buffer.lo file_io/os2/copy.lo file_io/os2/dir.lo file_io/os2/dir_make_recurse.lo file_io/os2/fileacc.lo file_io/os2/filedup.lo file_io/os2/filepath.lo file_io/os2/filepath_util.lo file_io/os2/filestat.lo file_io/os2/filesys.lo file_io/os2/flock.lo file_io/os2/fullrw.lo file_io/os2/maperrorcode.lo file_io/os2/mktemp.lo file_io/os2/open.lo file_io/os2/pipe.lo file_io/os2/readwrite.lo file_io/os2/seek.lo file_io/os2/tempdir.lo
 
-locks/os2/proc_mutex.lo: locks/os2/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-locks/os2/thread_cond.lo: locks/os2/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-locks/os2/thread_mutex.lo: locks/os2/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-locks/os2/thread_rwlock.lo: locks/os2/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/os2/proc_mutex.lo: locks/os2/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/os2/thread_cond.lo: locks/os2/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/os2/thread_mutex.lo: locks/os2/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/os2/thread_rwlock.lo: locks/os2/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_locks_os2 = locks/os2/proc_mutex.lo locks/os2/thread_cond.lo locks/os2/thread_mutex.lo locks/os2/thread_rwlock.lo
 
 network_io/os2/inet_ntop.lo: network_io/os2/inet_ntop.c .make.dirs 
 network_io/os2/inet_pton.lo: network_io/os2/inet_pton.c .make.dirs 
-network_io/os2/os2calls.lo: network_io/os2/os2calls.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-network_io/os2/sendrecv.lo: network_io/os2/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-network_io/os2/sendrecv_udp.lo: network_io/os2/sendrecv_udp.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/os2/os2calls.lo: network_io/os2/os2calls.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/os2/sendrecv.lo: network_io/os2/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/os2/sendrecv_udp.lo: network_io/os2/sendrecv_udp.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_support.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 network_io/os2/sockaddr.lo: network_io/os2/sockaddr.c .make.dirs 
 network_io/os2/socket_util.lo: network_io/os2/socket_util.c .make.dirs 
-network_io/os2/sockets.lo: network_io/os2/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-network_io/os2/sockopt.lo: network_io/os2/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/os2/sockets.lo: network_io/os2/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/os2/sockopt.lo: network_io/os2/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_network_io_os2 = network_io/os2/inet_ntop.lo network_io/os2/inet_pton.lo network_io/os2/os2calls.lo network_io/os2/sendrecv.lo network_io/os2/sendrecv_udp.lo network_io/os2/sockaddr.lo network_io/os2/socket_util.lo network_io/os2/sockets.lo network_io/os2/sockopt.lo
 
-poll/os2/poll.lo: poll/os2/poll.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-poll/os2/pollset.lo: poll/os2/pollset.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/os2/poll.lo: poll/os2/poll.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+poll/os2/pollset.lo: poll/os2/pollset.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_poll.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_poll_os2 = poll/os2/poll.lo poll/os2/pollset.lo
 
-shmem/os2/shm.lo: shmem/os2/shm.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+shmem/os2/shm.lo: shmem/os2/shm.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_shmem_os2 = shmem/os2/shm.lo
 
-threadproc/os2/proc.lo: threadproc/os2/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_signal.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/os2/proc.lo: threadproc/os2/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_signal.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 threadproc/os2/signals.lo: threadproc/os2/signals.c .make.dirs 
-threadproc/os2/thread.lo: threadproc/os2/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-threadproc/os2/threadpriv.lo: threadproc/os2/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/os2/thread.lo: threadproc/os2/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/os2/threadpriv.lo: threadproc/os2/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_threadproc_os2 = threadproc/os2/proc.lo threadproc/os2/signals.lo threadproc/os2/thread.lo threadproc/os2/threadpriv.lo
 
 OBJECTS_os2 = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_os2) $(OBJECTS_file_io_os2) $(OBJECTS_locks_os2) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_os2) $(OBJECTS_poll_os2) $(OBJECTS_random_unix) $(OBJECTS_shmem_os2) $(OBJECTS_support_unix) $(OBJECTS_threadproc_os2) $(OBJECTS_time_unix) $(OBJECTS_user_unix)
 
-dso/os390/dso.lo: dso/os390/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+dso/os390/dso.lo: dso/os390/dso.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_dso_os390 = dso/os390/dso.lo
 
-atomic/os390/atomic.lo: atomic/os390/atomic.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_want.h
+atomic/os390/atomic.lo: atomic/os390/atomic.c .make.dirs 
 
 OBJECTS_atomic_os390 = atomic/os390/atomic.lo
 
 OBJECTS_os390 = $(OBJECTS_all) $(OBJECTS_atomic_os390) $(OBJECTS_dso_os390) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix)
 
-dso/win32/dso.lo: dso/win32/dso.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+dso/win32/dso.lo: dso/win32/dso.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 
 OBJECTS_dso_win32 = dso/win32/dso.lo
 
-file_io/win32/buffer.lo: file_io/win32/buffer.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_want.h
-file_io/win32/dir.lo: file_io/win32/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/win32/buffer.lo: file_io/win32/buffer.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
+file_io/win32/dir.lo: file_io/win32/dir.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/win32/filedup.lo: file_io/win32/filedup.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/win32/filepath.lo: file_io/win32/filepath.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+file_io/win32/filepath.lo: file_io/win32/filepath.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 file_io/win32/filestat.lo: file_io/win32/filestat.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-file_io/win32/filesys.lo: file_io/win32/filesys.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+file_io/win32/filesys.lo: file_io/win32/filesys.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 file_io/win32/flock.lo: file_io/win32/flock.c .make.dirs 
-file_io/win32/open.lo: file_io/win32/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+file_io/win32/open.lo: file_io/win32/open.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/win32/pipe.lo: file_io/win32/pipe.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_escape.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/win32/readwrite.lo: file_io/win32/readwrite.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 file_io/win32/seek.lo: file_io/win32/seek.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_file_io_win32 = file_io/unix/copy.lo file_io/unix/fileacc.lo file_io/unix/filepath_util.lo file_io/unix/fullrw.lo file_io/unix/mktemp.lo file_io/unix/tempdir.lo file_io/win32/buffer.lo file_io/win32/dir.lo file_io/win32/filedup.lo file_io/win32/filepath.lo file_io/win32/filestat.lo file_io/win32/filesys.lo file_io/win32/flock.lo file_io/win32/open.lo file_io/win32/pipe.lo file_io/win32/readwrite.lo file_io/win32/seek.lo
 
-locks/win32/proc_mutex.lo: locks/win32/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-locks/win32/thread_cond.lo: locks/win32/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-locks/win32/thread_mutex.lo: locks/win32/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-locks/win32/thread_rwlock.lo: locks/win32/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/win32/proc_mutex.lo: locks/win32/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/win32/thread_cond.lo: locks/win32/thread_cond.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/win32/thread_mutex.lo: locks/win32/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+locks/win32/thread_rwlock.lo: locks/win32/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_locks_win32 = locks/win32/proc_mutex.lo locks/win32/thread_cond.lo locks/win32/thread_mutex.lo locks/win32/thread_rwlock.lo
 
-misc/win32/charset.lo: misc/win32/charset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-misc/win32/env.lo: misc/win32/env.c .make.dirs include/apr_allocator.h include/apr_env.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_want.h
+misc/win32/charset.lo: misc/win32/charset.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+misc/win32/env.lo: misc/win32/env.c .make.dirs include/apr_allocator.h include/apr_env.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_strings.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 misc/win32/internal.lo: misc/win32/internal.c .make.dirs 
 misc/win32/misc.lo: misc/win32/misc.c .make.dirs include/apr_errno.h include/apr_lib.h
-misc/win32/rand.lo: misc/win32/rand.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-misc/win32/start.lo: misc/win32/start.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_signal.h include/apr_thread_mutex.h include/apr_want.h
+misc/win32/rand.lo: misc/win32/rand.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+misc/win32/start.lo: misc/win32/start.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_signal.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 misc/win32/utf8.lo: misc/win32/utf8.c .make.dirs include/apr_errno.h
 
 OBJECTS_misc_win32 = misc/unix/errorcodes.lo misc/unix/getopt.lo misc/unix/otherchild.lo misc/unix/version.lo misc/win32/charset.lo misc/win32/env.lo misc/win32/internal.lo misc/win32/misc.lo misc/win32/rand.lo misc/win32/start.lo misc/win32/utf8.lo
 
-mmap/win32/mmap.lo: mmap/win32/mmap.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_mmap.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_ring.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+mmap/win32/mmap.lo: mmap/win32/mmap.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_mmap.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_ring.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_mmap_win32 = mmap/unix/common.lo mmap/win32/mmap.lo
 
-network_io/win32/sendrecv.lo: network_io/win32/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
-network_io/win32/sockets.lo: network_io/win32/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-network_io/win32/sockopt.lo: network_io/win32/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/win32/sendrecv.lo: network_io/win32/sendrecv.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/win32/sockets.lo: network_io/win32/sockets.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+network_io/win32/sockopt.lo: network_io/win32/sockopt.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_network_io_win32 = network_io/unix/inet_ntop.lo network_io/unix/inet_pton.lo network_io/unix/multicast.lo network_io/unix/sockaddr.lo network_io/unix/socket_util.lo network_io/win32/sendrecv.lo network_io/win32/sockets.lo network_io/win32/sockopt.lo
 
-shmem/win32/shm.lo: shmem/win32/shm.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
+shmem/win32/shm.lo: shmem/win32/shm.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_perms_set.h include/apr_pools.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_shmem_win32 = shmem/win32/shm.lo
 
-threadproc/win32/proc.lo: threadproc/win32/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-threadproc/win32/signals.lo: threadproc/win32/signals.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_pools.h include/apr_signal.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-threadproc/win32/thread.lo: threadproc/win32/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-threadproc/win32/threadpriv.lo: threadproc/win32/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/win32/proc.lo: threadproc/win32/proc.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/win32/signals.lo: threadproc/win32/signals.c .make.dirs include/apr_allocator.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_inherit.h include/apr_perms_set.h include/apr_pools.h include/apr_signal.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/win32/thread.lo: threadproc/win32/thread.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+threadproc/win32/threadpriv.lo: threadproc/win32/threadpriv.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_threadproc_win32 = threadproc/win32/proc.lo threadproc/win32/signals.lo threadproc/win32/thread.lo threadproc/win32/threadpriv.lo
 
-time/win32/time.lo: time/win32/time.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-time/win32/timestr.lo: time/win32/timestr.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+time/win32/time.lo: time/win32/time.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_lib.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+time/win32/timestr.lo: time/win32/timestr.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_time_win32 = time/win32/time.lo time/win32/timestr.lo
 
-user/win32/groupinfo.lo: user/win32/groupinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
-user/win32/userinfo.lo: user/win32/userinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+user/win32/groupinfo.lo: user/win32/groupinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
+user/win32/userinfo.lo: user/win32/userinfo.c .make.dirs include/apr_allocator.h include/apr_dso.h include/apr_errno.h include/apr_file_info.h include/apr_file_io.h include/apr_general.h include/apr_global_mutex.h include/apr_inherit.h include/apr_network_io.h include/apr_perms_set.h include/apr_pools.h include/apr_portable.h include/apr_proc_mutex.h include/apr_shm.h include/apr_strings.h include/apr_tables.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_time.h include/apr_user.h include/apr_want.h
 
 OBJECTS_user_win32 = user/win32/groupinfo.lo user/win32/userinfo.lo
 
-atomic/win32/apr_atomic.lo: atomic/win32/apr_atomic.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_want.h
+atomic/win32/apr_atomic.lo: atomic/win32/apr_atomic.c .make.dirs 
+atomic/win32/apr_atomic64.lo: atomic/win32/apr_atomic64.c .make.dirs include/apr_allocator.h include/apr_atomic.h include/apr_errno.h include/apr_general.h include/apr_pools.h include/apr_thread_mutex.h include/apr_time.h include/apr_want.h
 
-OBJECTS_atomic_win32 = atomic/win32/apr_atomic.lo
+OBJECTS_atomic_win32 = atomic/win32/apr_atomic.lo atomic/win32/apr_atomic64.lo
 
 OBJECTS_win32 = $(OBJECTS_all) $(OBJECTS_atomic_win32) $(OBJECTS_dso_win32) $(OBJECTS_file_io_win32) $(OBJECTS_locks_win32) $(OBJECTS_memory_unix) $(OBJECTS_misc_win32) $(OBJECTS_mmap_win32) $(OBJECTS_network_io_win32) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_win32) $(OBJECTS_support_unix) $(OBJECTS_threadproc_win32) $(OBJECTS_time_win32) $(OBJECTS_user_win32)
 
-HEADERS = $(top_srcdir)/include/apr_allocator.h $(top_srcdir)/include/apr_atomic.h $(top_srcdir)/include/apr_dso.h $(top_srcdir)/include/apr_env.h $(top_srcdir)/include/apr_errno.h $(top_srcdir)/include/apr_escape.h $(top_srcdir)/include/apr_file_info.h $(top_srcdir)/include/apr_file_io.h $(top_srcdir)/include/apr_fnmatch.h $(top_srcdir)/include/apr_general.h $(top_srcdir)/include/apr_getopt.h $(top_srcdir)/include/apr_global_mutex.h $(top_srcdir)/include/apr_hash.h $(top_srcdir)/include/apr_inherit.h $(top_srcdir)/include/apr_lib.h $(top_srcdir)/include/apr_mmap.h $(top_srcdir)/include/apr_network_io.h $(top_srcdir)/include/apr_poll.h $(top_srcdir)/include/apr_pools.h $(top_srcdir)/include/apr_portable.h $(top_srcdir)/include/apr_proc_mutex.h $(top_srcdir)/include/apr_random.h $(top_srcdir)/include/apr_ring.h $(top_srcdir)/include/apr_shm.h $(top_srcdir)/include/apr_signal.h $(top_srcdir)/include/apr_skiplist.h $(top_srcdir)/include/apr_strings.h $(top_srcdir)/include/apr_support.h $(top_srcdir)/include/apr_tables.h $(top_srcdir)/include/apr_thread_cond.h $(top_srcdir)/include/apr_thread_mutex.h $(top_srcdir)/include/apr_thread_proc.h $(top_srcdir)/include/apr_thread_rwlock.h $(top_srcdir)/include/apr_time.h $(top_srcdir)/include/apr_user.h $(top_srcdir)/include/apr_version.h $(top_srcdir)/include/apr_want.h
+HEADERS = $(top_srcdir)/include/apr_allocator.h $(top_srcdir)/include/apr_atomic.h $(top_srcdir)/include/apr_cstr.h $(top_srcdir)/include/apr_dso.h $(top_srcdir)/include/apr_encode.h $(top_srcdir)/include/apr_env.h $(top_srcdir)/include/apr_errno.h $(top_srcdir)/include/apr_escape.h $(top_srcdir)/include/apr_file_info.h $(top_srcdir)/include/apr_file_io.h $(top_srcdir)/include/apr_fnmatch.h $(top_srcdir)/include/apr_general.h $(top_srcdir)/include/apr_getopt.h $(top_srcdir)/include/apr_global_mutex.h $(top_srcdir)/include/apr_hash.h $(top_srcdir)/include/apr_inherit.h $(top_srcdir)/include/apr_lib.h $(top_srcdir)/include/apr_mmap.h $(top_srcdir)/include/apr_network_io.h $(top_srcdir)/include/apr_perms_set.h $(top_srcdir)/include/apr_poll.h $(top_srcdir)/include/apr_pools.h $(top_srcdir)/include/apr_portable.h $(top_srcdir)/include/apr_proc_mutex.h $(top_srcdir)/include/apr_random.h $(top_srcdir)/include/apr_ring.h $(top_srcdir)/include/apr_shm.h $(top_srcdir)/include/apr_signal.h $(top_srcdir)/include/apr_skiplist.h $(top_srcdir)/include/apr_strings.h $(top_srcdir)/include/apr_support.h $(top_srcdir)/include/apr_tables.h $(top_srcdir)/include/apr_thread_cond.h $(top_srcdir)/include/apr_thread_mutex.h $(top_srcdir)/include/apr_thread_proc.h $(top_srcdir)/include/apr_thread_rwlock.h $(top_srcdir)/include/apr_time.h $(top_srcdir)/include/apr_user.h $(top_srcdir)/include/apr_version.h $(top_srcdir)/include/apr_want.h
 
-SOURCE_DIRS = random/unix misc/win32 encoding dso/os2 time/unix network_io/win32 dso/win32 locks/unix user/unix time/win32 locks/beos tables support/unix file_io/unix mmap/unix atomic/unix threadproc/win32 poll/os2 atomic/win32 dso/os390 atomic/os390 dso/beos poll/unix passwd network_io/beos threadproc/os2 network_io/os2 shmem/win32 threadproc/beos shmem/unix network_io/unix file_io/os2 mmap/win32 dso/aix file_io/win32 threadproc/unix misc/unix locks/win32 shmem/beos dso/unix locks/os2 user/win32 shmem/os2 memory/unix strings $(EXTRA_SOURCE_DIRS)
+SOURCE_DIRS = encoding passwd strings tables dso/unix file_io/unix locks/unix memory/unix misc/unix mmap/unix network_io/unix poll/unix random/unix shmem/unix support/unix threadproc/unix time/unix user/unix atomic/unix dso/aix dso/beos locks/beos network_io/beos shmem/beos threadproc/beos dso/os2 file_io/os2 locks/os2 network_io/os2 poll/os2 shmem/os2 threadproc/os2 dso/os390 atomic/os390 dso/win32 file_io/win32 locks/win32 misc/win32 mmap/win32 network_io/win32 shmem/win32 threadproc/win32 time/win32 user/win32 atomic/win32 $(EXTRA_SOURCE_DIRS)
 
 BUILD_DIRS = atomic atomic/os390 atomic/unix atomic/win32 dso dso/aix dso/beos dso/os2 dso/os390 dso/unix dso/win32 encoding file_io file_io/os2 file_io/unix file_io/win32 locks locks/beos locks/os2 locks/unix locks/win32 memory memory/unix misc misc/unix misc/win32 mmap mmap/unix mmap/win32 network_io network_io/beos network_io/os2 network_io/unix network_io/win32 passwd poll poll/os2 poll/unix random random/unix shmem shmem/beos shmem/os2 shmem/unix shmem/win32 strings support support/unix tables threadproc threadproc/beos threadproc/os2 threadproc/unix threadproc/win32 time time/unix time/win32 user user/unix user/win32
 
 .make.dirs: $(srcdir)/build-outputs.mk
 	@for d in $(BUILD_DIRS); do test -d $$d || mkdir $$d; done
 	@echo timestamp > $@
Index: head/contrib/apr/buildconf
===================================================================
--- head/contrib/apr/buildconf	(revision 361677)
+++ head/contrib/apr/buildconf	(revision 361678)
@@ -1,134 +1,136 @@
 #!/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.
 
 if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
     verbose="--verbose"
     shift
 fi
 
 # Verify that the builder has the right config tools installed
 #
 build/buildcheck.sh $verbose || exit 1
 
 libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 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 "buildconf: copying libtool helper files using $libtoolize"
 
 # Remove any libtool files so one can switch between libtool versions
 # by simply rerunning the buildconf script.
 rm -f aclocal.m4 libtool.m4
 (cd build ; rm -f ltconfig ltmain.sh argz.m4 libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4)
 
 # Determine libtool version, because --copy behaves differently
 # w.r.t. copying libtool.m4
 lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
 lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
 IFS=.; set $lt_version; IFS=' '
 
 # libtool 1
 if test "$1" = "1"; then
   $libtoolize --copy --automake
   # Unlikely, maybe for old versions the file exists
   if [ -f libtool.m4 ]; then 
     ltfile=`pwd`/libtool.m4
   else
 
     # Extract all lines setting variables from libtoolize up until
     # libtool_m4 gets set
     ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
                    < $libtoolize`"
 
     # Get path to libtool.m4 either from LIBTOOL_M4 env var or our libtoolize based script
     ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`}
 
     # Expecting the code above to be very portable, but just in case...
     if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
       ltpath=`dirname $libtoolize`
       ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
     fi
   fi
   if [ ! -f $ltfile ]; then
     echo "$ltfile not found"
     exit 1
   fi
   # Do we need this anymore?
   echo "buildconf: Using libtool.m4 at ${ltfile}."
   rm -f build/libtool.m4
   cp -p $ltfile build/libtool.m4
 
 # libtool 2
 elif test "$1" = "2"; then
   $libtoolize --copy --quiet $verbose
 fi
 
 # Replace top_builddir by apr_builddir.
 # Wouldn't it just be better to define top_builddir??
 # Not sure, would it interfere with httpd top_builddir when bundled?
 mv build/libtool.m4 build/libtool.m4.$$
 sed -e 's/\(LIBTOOL=.*\)top_build/\1apr_build/' < build/libtool.m4.$$ > build/libtool.m4
 rm -f build/libtool.m4.$$
 
 # Clean up any leftovers
 rm -f aclocal.m4 libtool.m4
 
 #
 # Generate the autoconf header and ./configure
 #
 echo "buildconf: creating include/arch/unix/apr_private.h.in ..."
 ${AUTOHEADER:-autoheader} $verbose
 
 echo "buildconf: creating configure ..."
 ### do some work to toss config.cache?
 ${AUTOCONF:-autoconf} $verbose
 
 # Remove autoconf 2.5x's cache directory
 rm -rf autom4te*.cache
 
+PYTHON=${PYTHON-`build/PrintPath python3 python2 python`}
+
 echo "buildconf: generating 'make' outputs ..."
-build/gen-build.py $verbose make
+${PYTHON} build/gen-build.py $verbose make
 
 # Create RPM Spec file
 if [ -f `which cut` ]; then
   echo "buildconf: 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
Index: head/contrib/apr/config.layout
===================================================================
--- head/contrib/apr/config.layout	(revision 361677)
+++ head/contrib/apr/config.layout	(revision 361678)
@@ -1,231 +1,232 @@
 ##
 ##  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-${APR_MAJOR_VERSION}
     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
+    installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
     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>
Index: head/contrib/apr/configure
===================================================================
--- head/contrib/apr/configure	(revision 361677)
+++ head/contrib/apr/configure	(revision 361678)
@@ -1,30878 +1,32465 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
 esac
 fi
 
 
 as_nl='
 '
 export as_nl
 # Printing a long string crashes Solaris 7 /usr/bin/printf.
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 # Prefer a ksh shell builtin over an external printf program on Solaris,
 # but without wasting forks for bash or zsh.
 if test -z "$BASH_VERSION$ZSH_VERSION" \
     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='print -r --'
   as_echo_n='print -rn --'
 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
   if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
     as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
     as_echo_n='/usr/ucb/echo -n'
   else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
       case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
       esac;
       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
     '
     export as_echo_n_body
     as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
   export as_echo_body
   as_echo='sh -c $as_echo_body as_echo'
 fi
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
       PATH_SEPARATOR=';'
   }
 fi
 
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
      ;;
 esac
 # We did not find ourselves, most probably we were run as `sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
 # Unset variables that we do not need and which cause bugs (e.g. in
 # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
 # suppresses any "Segmentation fault" message there.  '((' could
 # trigger a bug in pdksh 5.2.14.
 for as_var in BASH_ENV ENV MAIL MAILPATH
 do eval test x\${$as_var+set} = xset \
   && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
 LC_ALL=C
 export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
   if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
     _as_can_reexec=no; export _as_can_reexec;
     # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
 # works around shells that cannot unset nonexistent variables.
 # Preserve -v and -x to the replacement shell.
 BASH_ENV=/dev/null
 ENV=/dev/null
 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 case $- in # ((((
   *v*x* | *x*v* ) as_opts=-vx ;;
   *v* ) as_opts=-v ;;
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 as_fn_exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
 esac
 fi
 "
   as_required="as_fn_return () { (exit \$1); }
 as_fn_success () { as_fn_return 0; }
 as_fn_failure () { as_fn_return 1; }
 as_fn_ret_success () { return 0; }
 as_fn_ret_failure () { return 1; }
 
 exitcode=0
 as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
 if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
 else
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1
 
   test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
     ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
     ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
     ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
     PATH=/empty FPATH=/empty; export PATH FPATH
     test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
       || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
   as_have_required=no
 fi
   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
 	     as_shell=$as_dir/$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
   CONFIG_SHELL=$as_shell as_have_required=yes
 		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
   break 2
 fi
 fi
 	   done;;
        esac
   as_found=false
 done
 $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
 	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
   CONFIG_SHELL=$SHELL as_have_required=yes
 fi; }
 IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
 # works around shells that cannot unset nonexistent variables.
 # Preserve -v and -x to the replacement shell.
 BASH_ENV=/dev/null
 ENV=/dev/null
 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 case $- in # ((((
   *v*x* | *x*v* ) as_opts=-vx ;;
   *v* ) as_opts=-v ;;
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno; then :
   $as_echo "$0: This script requires a shell more modern than all"
   $as_echo "$0: the shells that I found on your system."
   if test x${ZSH_VERSION+set} = xset ; then
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
 fi
 fi
 SHELL=${CONFIG_SHELL-/bin/sh}
 export SHELL
 # Unset more variables known to interfere with behavior of common tools.
 CLICOLOR_FORCE= GREP_OPTIONS=
 unset CLICOLOR_FORCE GREP_OPTIONS
 
 ## --------------------- ##
 ## M4sh Shell Functions. ##
 ## --------------------- ##
 # as_fn_unset VAR
 # ---------------
 # Portably unset VAR.
 as_fn_unset ()
 {
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
 
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
 as_fn_set_status ()
 {
   return $1
 } # as_fn_set_status
 
 # as_fn_exit STATUS
 # -----------------
 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
 as_fn_exit ()
 {
   set +e
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
 
 # as_fn_mkdir_p
 # -------------
 # Create "$as_dir" as a directory, including parents if necessary.
 as_fn_mkdir_p ()
 {
 
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
   test -d "$as_dir" || eval $as_mkdir_p || {
     as_dirs=
     while :; do
       case $as_dir in #(
       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
       as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
 
 # as_fn_executable_p FILE
 # -----------------------
 # Test if FILE is an executable regular file.
 as_fn_executable_p ()
 {
   test -f "$1" && test -x "$1"
 } # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
 else
   as_fn_append ()
   {
     eval $1=\$$1\$2
   }
 fi # as_fn_append
 
 # as_fn_arith ARG...
 # ------------------
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
 else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
 # script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
   $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
   as_dirname=dirname
 else
   as_dirname=false
 fi
 
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
 
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
   as_lineno_1=$LINENO as_lineno_1a=$LINENO
   as_lineno_2=$LINENO as_lineno_2a=$LINENO
   eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
   test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
   # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
   ' <$as_myself |
     sed '
       s/[$]LINENO.*/&-/
       t lineno
       b
       :lineno
       N
       :loop
       s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
   # in an infinite loop.  This has already happened in practice.
   _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
   . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
   case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
   xy)  ECHO_C='\c';;
   *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
        ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
   mkdir conf$$.dir 2>/dev/null
 fi
 if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
     as_ln_s='cp -pR'
   fi
 else
   as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_test_x='test -x'
 as_executable_p=as_fn_executable_p
 
 # 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'"
 
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
 ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
 PACKAGE_NAME=
 PACKAGE_TARNAME=
 PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 PACKAGE_URL=
 
 ac_unique_file="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_OUTPUTS
 INCLUDE_RULES
 LT_NO_INSTALL
 LIBTOOL_LIBS
 DEFAULT_OSDIR
 OSDIR
 INCLUDES
 LDLIBS
 INTERNAL_CPPFLAGS
 NOTEST_INCLUDES
 NOTEST_LIBS
 NOTEST_LDFLAGS
 NOTEST_CFLAGS
 NOTEST_CPPFLAGS
 EXTRA_INCLUDES
 EXTRA_LIBS
 EXTRA_LDFLAGS
 EXTRA_CFLAGS
 EXTRA_CPPFLAGS
 apr_has_user
 apr_thread_func
 apr_procattr_user_set_requires_password
 apr_has_xthread_files
 have_unicode_fs
+apr_has_timedlocks
 have_ipv6
+have_sockaddr_un
 have_sa_storage
 have_sctp
 acceptfilter
 have_corkable_tcp
 apr_tcp_nopush_flag
 file_as_socket
 have_in_addr
 osuuid
 rand
 proclockglobal
 pthreadser
 procpthreadser
 fcntlser
 posixser
 sysvser
 flockser
 hasprocpthreadser
 hasfcntlser
 hasposixser
 hassysvser
 hasflockser
+have_pthread_condattr_setpshared
+have_pthread_mutex_timedlock
 have_union_semun
 struct_rlimit
 have_proc_invoked
 oc
 aprdso
 have_memchr
 have_strstr
 have_strdup
 have_strcasecmp
 have_stricmp
 have_strncasecmp
 have_strnicmp
 ino_t_value
 have_iovec
 aprlfs
 bigendian
 stdint
 uint64_literal
 int64_literal
 pid_t_fmt
 off_t_fmt
 size_t_fmt
 ssize_t_fmt
 uint64_t_hex_fmt
 uint64_t_fmt
 int64_t_fmt
 socklen_t_value
 ssize_t_value
 size_t_value
 off_t_value
+uint64_value
 int64_value
-long_value
 int_value
 short_value
 voidp_size
 winsock2h
 windowsh
 semaphoreh
 pthreadh
 processh
 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
+inttypesh
 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
 ALLOCA
 sharedmem
 havewin32shm
 haveos2shm
 havebeosarea
 haveshmget
 havemmapshm
 havemmaptmp
 usewin32shm
 useos2shm
 usebeosarea
 useshmget
 usemmapshm
 usemmaptmp
 havemmapanon
 havemmapzero
 haveshmgetanon
 usemmapanon
 usemmapzero
 useshmgetanon
 have_sigwait
 have_sigsuspend
 threads
 INSTALL_SUBDIRS
 eolstr
 proc_mutex_is_global
 OBJECTS_PLATFORM
 MKDEP
 LT_VERSION
 LT_LDFLAGS
 LTFLAGS
 shlibpath_var
 export_lib_target
 lib_target
 so_ext
 link
 lt_compile
 installbuilddir
+LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
 NMEDIT
 DSYMUTIL
 MANIFEST_TOOL
 STRIP
 ac_ct_AR
 NM
 ac_ct_DUMPBIN
 DUMPBIN
 LD
 FGREP
 LIBTOOL
 OBJDUMP
 DLLTOOL
 APR_LIBNAME
 apr_charset_ebcdic
 EGREP
 GREP
 AR
 ASCPP
 AS
 RM
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
 RANLIB
 LN_S
 AWK
 CPP
 SET_MAKE
 SED
 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_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_layout
 enable_experimental_libtool
 enable_shared
 enable_static
 with_pic
 enable_fast_install
+with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
 with_installbuilddir
 with_libtool
 enable_debug
 enable_maintainer_mode
 enable_profile
 enable_pool_debug
 enable_malloc_debug
 enable_lfs
 enable_nonportable_atomics
 enable_threads
 with_efence
+with_valgrind
 enable_posix_shm
 with_sendfile
 enable_allocator_uses_mmap
+enable_allocator_guard_pages
+enable_pool_concurrency_check
 enable_dso
 enable_other_child
 with_egd
 with_devrandom
 enable_ipv6
+enable_timedlocks
 '
       ac_precious_vars='build_alias
 host_alias
 target_alias
 CC
 CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP'
+CPP
+LT_SYS_LIBRARY_PATH'
 
 
 # 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= ;;
   *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
     bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
     ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
     build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
     cache_file=$ac_optarg ;;
 
   --config-cache | -C)
     cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
   -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
   | --dataroo | --dataro | --datar)
     ac_prev=datarootdir ;;
   -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
   | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
   -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
     docdir=$ac_optarg ;;
 
   -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
     ac_prev=dvidir ;;
   -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
   | --exec | --exe | --ex)
     ac_prev=exec_prefix ;;
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
     exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
   -help | --help | --hel | --he | -h)
     ac_init_help=long ;;
   -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
     ac_init_help=recursive ;;
   -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
     ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
     ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
   -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
     ac_prev=htmldir ;;
   -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
   | --ht=*)
     htmldir=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
     includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
     infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
     libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
   -localedir | --localedir | --localedi | --localed | --locale)
     ac_prev=localedir ;;
   -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
     localedir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
     mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
     with_fp=no ;;
 
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c | -n)
     no_create=yes ;;
 
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
   | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
     no_recursion=yes ;;
 
   -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
   | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
   | --oldin | --oldi | --old | --ol | --o)
     ac_prev=oldincludedir ;;
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
     oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
     prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
     program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
     program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
   | --program-transform-n | --program-transform- \
   | --program-transform | --program-transfor \
   | --program-transfo | --program-transf \
   | --program-trans | --program-tran \
   | --progr-tra | --program-tr | --program-t)
     ac_prev=program_transform_name ;;
   -program-transform-name=* | --program-transform-name=* \
   | --program-transform-nam=* | --program-transform-na=* \
   | --program-transform-n=* | --program-transform-=* \
   | --program-transform=* | --program-transfor=* \
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
   -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
     ac_prev=pdfdir ;;
   -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
     pdfdir=$ac_optarg ;;
 
   -psdir | --psdir | --psdi | --psd | --ps)
     ac_prev=psdir ;;
   -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
     psdir=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
     sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
   | --sharedst | --shareds | --shared | --share | --shar \
   | --sha | --sh)
     ac_prev=sharedstatedir ;;
   -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
     sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
     site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
     srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
     sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
     ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
     target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers | -V)
     ac_init_version=: ;;
 
   -with-* | --with-*)
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
     with_x=yes ;;
 
   -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
   | --x-incl | --x-inc | --x-in | --x-i)
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
     x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
   -*) as_fn_error $? "unrecognized option: \`$ac_option'
 Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
 # Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
   case $ac_val in
     */ )
       ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
       eval $ac_var=\$ac_val;;
   esac
   # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
 build=$build_alias
 host=$host_alias
 target=$target_alias
 
 # FIXME: To remove some day.
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
 fi
 
 ac_tool_prefix=
 test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
 test "$silent" = yes && exec 6>/dev/null
 
 
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
   as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
   as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
   ac_confdir=`$as_dirname -- "$as_myself" ||
 $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
   srcdir=$ac_confdir
   if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
   srcdir=.
 fi
 # Remove unnecessary trailing slashes from srcdir.
 # Double slashes in file names in object file debugging info
 # mess up M-x gdb in Emacs.
 case $srcdir in
 */) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
 esac
 for ac_var in $ac_precious_vars; do
   eval ac_env_${ac_var}_set=\${${ac_var}+set}
   eval ac_env_${ac_var}_value=\$${ac_var}
   eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
   eval ac_cv_env_${ac_var}_value=\$${ac_var}
 done
 
 #
 # Report the --help message.
 #
 if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
 \`configure' configures this package to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 To assign environment variables (e.g., CC, CFLAGS...), specify them as
 VAR=VALUE.  See below for descriptions of some of the useful variables.
 
 Defaults for the options are specified in brackets.
 
 Configuration:
   -h, --help              display this help and exit
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
   -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                           [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                           [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
 an installation prefix other than \`$ac_default_prefix' using \`--prefix',
 for instance \`--prefix=\$HOME'.
 
 For better control, use the options below.
 
 Fine tuning of the installation directories:
   --bindir=DIR            user executables [EPREFIX/bin]
   --sbindir=DIR           system admin executables [EPREFIX/sbin]
   --libexecdir=DIR        program executables [EPREFIX/libexec]
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
   --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
   --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
   --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
   --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
 
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
   --target=TARGET   configure for building compilers for TARGET [HOST]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-layout=LAYOUT
   --enable-experimental-libtool Use experimental custom libtool
   --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
   --disable-lfs           Disable large file support on 32-bit platforms
   --enable-nonportable-atomics  Use optimized atomic code which may produce nonportable binaries
   --enable-threads        Enable threading support in APR.
   --enable-posix-shm      Use POSIX shared memory (shm_open) if available
   --enable-allocator-uses-mmap    Use mmap in apr_allocator instead of malloc
+  --enable-allocator-guard-pages  Use guard pages in apr_allocator
+                                  (implies --enable-allocator-uses-mmap)
+  --enable-pool-concurrency-check Check for concurrent usage of memory pools
   --disable-dso           Disable DSO support
   --enable-other-child    Enable reliable child processes
   --disable-ipv6          Disable IPv6 support in APR.
+  --disable-timedlocks	  Disable timed locks
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
-  --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
+  --with-installbuilddir=DIR location to store APR build files
   --without-libtool       avoid using libtool to link the library
   --with-efence[=DIR]     path to Electric Fence installation
+  --with-valgrind[=DIR]   Enable code to teach valgrind about apr pools
+                          (optionally: set path to valgrind headers)
   --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    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to the package provider.
 _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.69
 
 Copyright (C) 2012 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
 
 ## ------------------------ ##
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   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:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     grep -v '^ *+' conftest.err >conftest.er1
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then :
   ac_retval=0
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 
 # ac_fn_c_try_cpp LINENO
 # ----------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_cpp ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   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:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     grep -v '^ *+' conftest.err >conftest.er1
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
   ac_retval=0
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
 # the include files in INCLUDES and setting the cache variable VAR
 # accordingly.
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
 $as_echo_n "checking $2 usability... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_header_compiler=yes
 else
   ac_header_compiler=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
 $as_echo_n "checking $2 presence... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <$2>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   ac_header_preproc=yes
 else
   ac_header_preproc=no
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     ;;
   no:yes:* )
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
 $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
 # ac_fn_c_try_run LINENO
 # ----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
 # that executables *can* be run.
 ac_fn_c_try_run ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   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:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { 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:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then :
   ac_retval=0
 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
 
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
 # INCLUDES, setting the cache variable VAR accordingly.
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
 else
   eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   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:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     grep -v '^ *+' conftest.err >conftest.er1
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
 
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $2 (); 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 $2
 
 /* 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 $2 ();
 /* 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_$2 || defined __stub___$2
 choke me
 #endif
 
 int
 main ()
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   eval "$3=yes"
 else
   eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
 # variable VAR accordingly.
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
 if (sizeof ($2))
 	 return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
 if (sizeof (($2)))
 	    return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 else
   eval "$3=yes"
 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
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
 # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
 # --------------------------------------------
 # Tries to find the compile-time value of EXPR in a program that includes
 # INCLUDES, setting VAR accordingly. Returns whether the value could be
 # computed
 ac_fn_c_compute_int ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if test "$cross_compiling" = yes; then
     # Depending upon the size, compute the lo and hi bounds.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
 test_array [0] = 0;
 return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_lo=0 ac_mid=0
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
 return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_hi=$ac_mid; break
 else
   as_fn_arith $ac_mid + 1 && ac_lo=$as_val
 			if test $ac_lo -le $ac_mid; then
 			  ac_lo= ac_hi=
 			  break
 			fi
 			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
 test_array [0] = 0;
 return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_hi=-1 ac_mid=-1
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
 test_array [0] = 0;
 return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_lo=$ac_mid; break
 else
   as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
 			if test $ac_mid -le $ac_hi; then
 			  ac_lo= ac_hi=
 			  break
 			fi
 			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   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
   as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
 return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_hi=$ac_mid
 else
   as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in #((
 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
 '') ac_retval=1 ;;
 esac
   else
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 static long int longval () { return $2; }
 static unsigned long int ulongval () { return $2; }
 #include <stdio.h>
 #include <stdlib.h>
 int
 main ()
 {
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
   if (($2) < 0)
     {
       long int i = longval ();
       if (i != ($2))
 	return 1;
       fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
       if (i != ($2))
 	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
 if ac_fn_c_try_run "$LINENO"; then :
   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
 else
   ac_retval=1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 rm -f conftest.val
 
   fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
 
 # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
 # ---------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
 # accordingly.
 ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
   as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 $as_echo_n "checking whether $as_decl_name is declared... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
   (void) $as_decl_use;
 #else
   (void) $as_decl_name;
 #endif
 #endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
 else
   eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_decl
 
 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
 # ----------------------------------------------------
 # Tries to find if the field MEMBER exists in type AGGR, after including
 # INCLUDES, setting cache variable VAR accordingly.
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
 if eval \${$4+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
 main ()
 {
 static $2 ac_aggr;
 if (ac_aggr.$3)
 return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   eval "$4=yes"
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
 main ()
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
 return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   eval "$4=yes"
 else
   eval "$4=no"
 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
 eval ac_res=\$$4
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
 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.69.  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) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
       as_fn_append 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
       as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset 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
 
     $as_echo "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     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:${as_lineno-$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= ;; #(
       *) { eval $ac_var=; 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
 
     $as_echo "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     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
       $as_echo "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       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
       $as_echo "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       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'; as_fn_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
 
 $as_echo "/* confdefs.h */" > 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
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_URL "$PACKAGE_URL"
 _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
   # We do not want a PATH search for config.site.
   case $CONFIG_SITE in #((
     -*)  ac_site_file1=./$CONFIG_SITE;;
     */*) ac_site_file1=$CONFIG_SITE;;
     *)   ac_site_file1=./$CONFIG_SITE;;
   esac
 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 /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$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" \
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   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.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
 	{ $as_echo "$as_me:${as_lineno-$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.
       *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$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_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
 ## -------------------- ##
 
 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_fn_error $? "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5
 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 (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 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 57 LT_INIT
+# serial 58 LT_INIT
 
 
 # LT_PREREQ(VERSION)
 # ------------------
 # Complain and exit if this libtool version is less that VERSION.
 
 
 
 # _LT_CHECK_BUILDDIR
 # ------------------
 # Complain if the absolute build directory name contains unusual characters
 
 
 
 # LT_INIT([OPTIONS])
 # ------------------
 # LT_INIT
 
 # Old names:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+# _LT_PREPARE_CC_BASENAME
+
+
 # _LT_CC_BASENAME(CC)
 # -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
 
 
 
 # _LT_FILEUTILS_DEFAULTS
 # ----------------------
 # It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
 # _LT_FILEUTILS_DEFAULTS
 
 
 # _LT_SETUP
 # ---------
 # _LT_SETUP
 
 
 # _LT_PREPARE_SED_QUOTE_VARS
 # --------------------------
 # Define a few sed substitution that help us do robust quoting.
 
 
 # _LT_PROG_LTMAIN
 # ---------------
-# Note that this code is called both from `configure', and `config.status'
+# Note that this code is called both from 'configure', and 'config.status'
 # now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
 # so we pass a copy along to make sure it has a sensible value anyway.
 # _LT_PROG_LTMAIN
 
 
 ## ------------------------------------- ##
 ## Accumulate code for creating libtool. ##
 ## ------------------------------------- ##
 
 # So that we can recreate a full libtool script including additional
 # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
+# in macros and then make a single call at the end using the 'libtool'
 # label.
 
 
 # _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
 # ----------------------------------------
 # Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
 
 
 # Initialize.
 
 
 
 # _LT_CONFIG_LIBTOOL([COMMANDS])
 # ------------------------------
 # Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
 
 
 # Initialize.
 
 
 
 # _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
 # -----------------------------------------------------
 
 
 
 # _LT_FORMAT_COMMENT([COMMENT])
 # -----------------------------
 # Add leading comment marks to the start of each line, and a trailing
 # full-stop to the whole comment if one is not present already.
 
 
 
 
 ## ------------------------ ##
 ## FIXME: Eliminate VARNAME ##
 ## ------------------------ ##
 
 
 # _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
 # -------------------------------------------------------------------
 # CONFIGNAME is the name given to the value in the libtool script.
 # VARNAME is the (base) name used in the configure script.
 # VALUE may be 0, 1 or 2 for a computed quote escaped value based on
 # VARNAME.  Any other value will be used directly.
 
 
 
 # _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
 # --------------------------------------------------------
 
 
 
 # lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
 # ------------------------------------------------
 
 
 
 # _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
 # ---------------------------------------------------------
 
 
 
 # lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
 # --------------------------------------------------
 
 
 
 # lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
 # ---------------------------------------------------
 
 
 
 # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
 # ---------------------------------------------------
 
 
 
 
 # lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
 # ------------------------------------------------
 
 
 
 
 # _LT_CONFIG_STATUS_DECLARE([VARNAME])
 # ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
 # ------------------------------
 # We delimit libtool config variables with single quotes, so when
 # we write them to config.status, we have to be sure to quote all
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
 #    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 
 
 
 # _LT_LIBTOOL_TAGS
 # ----------------
 # Output comment and list of tags supported by the script
 
 
 
 # _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
 # -----------------------------------
 # Extract the dictionary values for VARNAME (optionally with TAG) and
 # expand to a commented shell variable setting:
 #
 #    # Some comment about what VAR is for.
 #    visible_name=$lt_internal_name
 
 
 
 # _LT_LIBTOOL_CONFIG_VARS
 # -----------------------
 # Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
 # script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
 # section) are produced by _LT_LIBTOOL_TAG_VARS.
 
 
 
 # _LT_LIBTOOL_TAG_VARS(TAG)
 # -------------------------
 
 
 
 # _LT_TAGVAR(VARNAME, [TAGNAME])
 # ------------------------------
 
 
 
 # _LT_CONFIG_COMMANDS
 # -------------------
 # Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
 # variables for single and double quote escaping we saved from calls
 # to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
 # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
 #_LT_CONFIG_COMMANDS
 
 
 # Initialize.
 
 
 # _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
 # ------------------------------------
 # Generate a child script FILE with all initialization necessary to
 # reuse the environment learned by the parent script, and make the
 # file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
+# '#!' sequence but before initialization text begins.  After this
 # macro, additional text can be appended to FILE to form the body of
 # the child script.  The macro ends with non-zero status if the
 # file could not be fully written (such as if the disk is full).
 # _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
 # This macro allows early generation of the libtool script (before
 # AC_OUTPUT is called), incase it is used in configure for compilation
 # tests.
 # LT_OUTPUT
 
 
 # _LT_CONFIG(TAG)
 # ---------------
 # If TAG is the built-in tag, 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 TAG from the
 # matching tagged config vars.
 # _LT_CONFIG
 
 
 # LT_SUPPORTED_TAG(TAG)
 # ---------------------
 # Trace this macro to discover what tags are supported by the libtool
 # --tag option, using:
 #    autoconf --trace 'LT_SUPPORTED_TAG:$1'
 
 
 
 # C support is built-in for now
 
 
 
 
 # LT_LANG(LANG)
 # -------------
 # Enable libtool support for the given language if not already enabled.
 # LT_LANG
 
 
 # _LT_LANG(LANGNAME)
 # ------------------
 # _LT_LANG
 
 
 #m4_ifndef
 
 
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 # _LT_LANG_DEFAULT_CONFIG
 
 # Obsolete macros:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # _LT_TAG_COMPILER
 # ----------------
 # _LT_TAG_COMPILER
 
 
 # _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
 # -------------------------
 
 
 
 # _LT_DARWIN_LINKER_FEATURES([TAG])
 # ---------------------------------
 # Checks for linker and compiler features on darwin
 
 
 # _LT_SYS_MODULE_PATH_AIX([TAGNAME])
 # ----------------------------------
 # 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.
 # Store the results from the different compilers for each TAGNAME.
 # Allow to override them for all tags through lt_cv_aix_libpath.
 # _LT_SYS_MODULE_PATH_AIX
 
 
 # _LT_SHELL_INIT(ARG)
 # -------------------
 # _LT_SHELL_INIT
 
 
 
 # _LT_PROG_ECHO_BACKSLASH
 # -----------------------
 # Find how we can fake an echo command that does not interpret backslash.
 # In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
 # _LT_PROG_ECHO_BACKSLASH
 
 
 # _LT_WITH_SYSROOT
 # ----------------
 
 
 # _LT_ENABLE_LOCK
 # ---------------
 # _LT_ENABLE_LOCK
 
 
 # _LT_PROG_AR
 # -----------
 # _LT_PROG_AR
 
 
 # _LT_CMD_OLD_ARCHIVE
 # -------------------
 # _LT_CMD_OLD_ARCHIVE
 
 
 # _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 #		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
 # ----------------------------------------------------------------
 # Check whether the given compiler option works
 # _LT_COMPILER_OPTION
 
 # Old name:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 #                  [ACTION-SUCCESS], [ACTION-FAILURE])
 # ----------------------------------------------------
 # Check whether the given linker option works
 # _LT_LINKER_OPTION
 
 # Old name:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # LT_CMD_MAX_LEN
 #---------------
 # LT_CMD_MAX_LEN
 
 # Old name:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # _LT_HEADER_DLFCN
 # ----------------
 # _LT_HEADER_DLFCN
 
 
 # _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 #                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
 # ----------------------------------------------------------------
 # _LT_TRY_DLOPEN_SELF
 
 
 # LT_SYS_DLOPEN_SELF
 # ------------------
 # LT_SYS_DLOPEN_SELF
 
 # Old name:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # _LT_COMPILER_C_O([TAGNAME])
 # ---------------------------
 # Check to see if options -c and -o are simultaneously supported by compiler.
 # This macro does not hard code the compiler like AC_PROG_CC_C_O.
 # _LT_COMPILER_C_O
 
 
 # _LT_COMPILER_FILE_LOCKS([TAGNAME])
 # ----------------------------------
 # Check to see if we can do hard links to lock some files if needed
 # _LT_COMPILER_FILE_LOCKS
 
 
 # _LT_CHECK_OBJDIR
 # ----------------
 # _LT_CHECK_OBJDIR
 
 
 # _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
 # --------------------------------------
 # Check hardcoding attributes.
 # _LT_LINKER_HARDCODE_LIBPATH
 
 
 # _LT_CMD_STRIPLIB
 # ----------------
 # _LT_CMD_STRIPLIB
 
 
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+# _LT_PREPARE_PATH_LIST
+
+
 # _LT_SYS_DYNAMIC_LINKER([TAG])
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
 # _LT_SYS_DYNAMIC_LINKER
 
 
 # _LT_PATH_TOOL_PREFIX(TOOL)
 # --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
 # _LT_PATH_TOOL_PREFIX
 
 # Old name:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # _LT_PATH_MAGIC
 # --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
 # _LT_PATH_MAGIC
 
 
 # LT_PATH_LD
 # ----------
 # find the pathname to the GNU or non-GNU linker
 # LT_PATH_LD
 
 # Old names:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # _LT_PATH_LD_GNU
 #- --------------
 # _LT_PATH_LD_GNU
 
 
 # _LT_CMD_RELOAD
 # --------------
 # find reload flag for linker
 #   -- PORTME Some linkers may need a different reload flag.
 # _LT_CMD_RELOAD
 
 
+# _LT_PATH_DD
+# -----------
+# find a working dd
+# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+# _LT_CMD_TRUNCATE
+
+
 # _LT_CHECK_MAGIC_METHOD
 # ----------------------
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 # _LT_CHECK_MAGIC_METHOD
 
 
 # LT_PATH_NM
 # ----------
 # find the pathname to a BSD- or MS-compatible name lister
 # LT_PATH_NM
 
 # Old names:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 # _LT_CHECK_SHAREDLIB_FROM_LINKLIB
 # --------------------------------
 # how to determine the name of the shared library
 # associated with a specific link library.
 #  -- PORTME fill in with the dynamic library characteristics
 # _LT_CHECK_SHAREDLIB_FROM_LINKLIB
 
 
 # _LT_PATH_MANIFEST_TOOL
 # ----------------------
 # locate the manifest tool
 # _LT_PATH_MANIFEST_TOOL
 
 
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+# _LT_DLL_DEF_P
+
+
 # LT_LIB_M
 # --------
 # check for math library
 # LT_LIB_M
 
 # Old name:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # _LT_COMPILER_NO_RTTI([TAGNAME])
 # -------------------------------
 # _LT_COMPILER_NO_RTTI
 
 
 # _LT_CMD_GLOBAL_SYMBOLS
 # ----------------------
  # _LT_CMD_GLOBAL_SYMBOLS
 
 
 # _LT_COMPILER_PIC([TAGNAME])
 # ---------------------------
 # _LT_COMPILER_PIC
 
 
 # _LT_LINKER_SHLIBS([TAGNAME])
 # ----------------------------
 # See if the linker supports building shared libraries.
 # _LT_LINKER_SHLIBS
 
 
 # _LT_LANG_C_CONFIG([TAG])
 # ------------------------
 # Ensure that the configuration variables for a C compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
 # _LT_LANG_C_CONFIG
 
 
 # _LT_LANG_CXX_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a C++ compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
 # _LT_LANG_CXX_CONFIG
 
 
 # _LT_FUNC_STRIPNAME_CNF
 # ----------------------
 # func_stripname_cnf prefix suffix name
 # strip PREFIX and SUFFIX off of NAME.
 # PREFIX and SUFFIX must not contain globbing or regex special
 # characters, hashes, percent signs, but SUFFIX may contain a leading
 # dot (in which case that matches only a dot).
 #
 # This function is identical to the (non-XSI) version of func_stripname,
 # except this one can be used by m4 code that may be executed by configure,
 # rather than the libtool script.
 # _LT_FUNC_STRIPNAME_CNF
 
+
 # _LT_SYS_HIDDEN_LIBDEPS([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.
 # _LT_SYS_HIDDEN_LIBDEPS
 
 
 # _LT_LANG_F77_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a Fortran 77 compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 # _LT_LANG_F77_CONFIG
 
 
 # _LT_LANG_FC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for a Fortran compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 # _LT_LANG_FC_CONFIG
 
 
 # _LT_LANG_GCJ_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for the GNU Java Compiler compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 # _LT_LANG_GCJ_CONFIG
 
 
 # _LT_LANG_GO_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for the GNU Go compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 # _LT_LANG_GO_CONFIG
 
 
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
 # _LT_LANG_RC_CONFIG
 
 
 # LT_PROG_GCJ
 # -----------
 
 
 # Old name:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # LT_PROG_GO
 # ----------
 
 
 
 # LT_PROG_RC
 # ----------
 
 
 # Old name:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # _LT_DECL_EGREP
 # --------------
 # If we don't have a new enough Autoconf to choose the best grep
 # available, choose the one first in the user's PATH.
 
 
 
 # _LT_DECL_OBJDUMP
 # --------------
 # If we don't have a new enough Autoconf to choose the best objdump
 # available, choose the one first in the user's PATH.
 
 
 # _LT_DECL_DLLTOOL
 # ----------------
 # Ensure DLLTOOL variable is set.
 
 
 # _LT_DECL_SED
 # ------------
 # Check for a fully-functional sed program, that truncates
 # as few characters as possible.  Prefer GNU sed if found.
 # _LT_DECL_SED
 
 #m4_ifndef
 
 # Old name:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 # _LT_CHECK_SHELL_FEATURES
 # ------------------------
 # Find out whether the shell is Bourne or XSI compatible,
 # or has some other useful features.
 # _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-
-
 # _LT_PATH_CONVERSION_FUNCTIONS
 # -----------------------------
-# Determine which file name conversion functions should be used by
+# Determine what file name conversion functions should be used by
 # func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
 # for certain cross-compile configurations and native mingw.
 # _LT_PATH_CONVERSION_FUNCTIONS
 
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
 # 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 6 ltsugar.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 
 
 
 # lt_join(SEP, ARG1, [ARG2...])
 # -----------------------------
 # Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
 # associated separator.
 # Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
 # versions in m4sugar had bugs.
 
 
 
 
 # lt_car(LIST)
 # lt_cdr(LIST)
 # ------------
 # Manipulate m4 lists.
 # These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
 
 
 
 
 
 # lt_append(MACRO-NAME, STRING, [SEPARATOR])
 # ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
 # Note that neither SEPARATOR nor STRING are expanded; they are appended
 # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
 # No SEPARATOR is output if MACRO-NAME was previously undefined (different
 # than defined and empty).
 #
 # This macro is needed until we can rely on Autoconf 2.62, since earlier
 # versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
 
 
 
 
 # lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
 # ----------------------------------------------------------
 # Produce a SEP delimited list of all paired combinations of elements of
 # PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
 # has the form PREFIXmINFIXSUFFIXn.
 # Needed until we can rely on m4_combine added in Autoconf 2.62.
 
 
 
 # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
 # -----------------------------------------------------------------------
 # Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
 # by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
 
 
 
 # lt_dict_add(DICT, KEY, VALUE)
 # -----------------------------
 
 
 
 # lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
 # --------------------------------------------
 
 
 
 # lt_dict_fetch(DICT, KEY, [SUBKEY])
 # ----------------------------------
 
 
 
 # lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
 # -----------------------------------------------------------------
 
 
 
 # lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
 # --------------------------------------------------------------
 
 
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # 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 7 ltoptions.m4
+# serial 8 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 
 
 
 # _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
 # ------------------------------------------
 
 
 
 # _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
 # ---------------------------------------
 # Set option OPTION-NAME for macro MACRO-NAME, and if there is a
 # matching handler defined, dispatch to it.  Other OPTION-NAMEs are
 # saved as a flag.
 
 
 
 # _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
 # ------------------------------------------------------------
 # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
 
 
 
 # _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
 # -------------------------------------------------------
 # Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
 # are set.
 
 
 
 # _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
 # ----------------------------------------
 # OPTION-LIST is a space-separated list of Libtool options associated
 # with MACRO-NAME.  If any OPTION has a matching handler declared with
 # LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
 # the unknown option and exit.
 # _LT_SET_OPTIONS
 
 
 ## --------------------------------- ##
 ## Macros to handle LT_INIT options. ##
 ## --------------------------------- ##
 
 # _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
 # -----------------------------------------
 
 
 
 # LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
 # -----------------------------------------------
 # LT_OPTION_DEFINE
 
 
 # dlopen
 # ------
 
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 
 # win32-dll
 # ---------
 # Declare package support for building win32 dll's.
 # win32-dll
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 
 # _LT_ENABLE_SHARED([DEFAULT])
 # ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 # _LT_ENABLE_SHARED
 
 
 
 
 # Old names:
 
 
 
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 
 
 # _LT_ENABLE_STATIC([DEFAULT])
 # ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 # _LT_ENABLE_STATIC
 
 
 
 
 # Old names:
 
 
 
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 
 
 # _LT_ENABLE_FAST_INSTALL([DEFAULT])
 # ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 # _LT_ENABLE_FAST_INSTALL
 
 
 
 
 # Old names:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+# _LT_WITH_AIX_SONAME
+
+
+
+
+
+
 # _LT_WITH_PIC([MODE])
 # --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
 # LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
 # _LT_WITH_PIC
 
 
 
 
 # Old name:
 # This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the
 # updated configure.ac (with AC_DIAGNOSE), and then outputs
 # the replacement expansion.
 
 
 # This is an auxiliary macro that is also run when
 # autoupdate runs m4.  It simply calls m4_warning, but
 # we need a wrapper so that each warning is emitted only
 # once.  We break the quoting in m4_warning's argument in
 # order to expand this macro's arguments, not AU_DEFUN's.
 
 
 # Finally, this is the expansion that is picked up by
 # autoconf.  It tells the user to run autoupdate, and
 # then outputs the replacement expansion.  We do not care
 # about autoupdate's warning because that contains
 # information on what to do *after* running autoupdate.
 
 
 
 ## ----------------- ##
 ## LTDL_INIT Options ##
 ## ----------------- ##
 
 
 
 
 
 
 
 
 
 
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # 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.
 
 # @configure_input@
 
-# serial 3337 ltversion.m4
+# serial 4179 ltversion.m4
 # This file is part of GNU Libtool
 
 
 
 
 
 
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # 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 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
 # which have later been changed to m4_define as they aren't part of the
 # exported API, or moved to Autoconf or Automake where they belong.
 #
 # The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
 # in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
 # using a macro with the same name in our local m4/libtool.m4 it'll
 # pull the old libtool.m4 in (it doesn't see our shiny new m4_define
 # and doesn't know about Autoconf macros at all.)
 #
 # So we provide this file, which has a silly filename so it's always
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
 # We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
 # we give up compatibility with versions before 1.7, at which point
 # we need to keep only those names which we still refer to.
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
   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 "$LTFLAGS"; then
     echo "LTFLAGS=\"$LTFLAGS\"; export LTFLAGS" >> 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_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
 if ${ac_cv_build+:} false; 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_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
   as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 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:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
 if ${ac_cv_host+:} false; 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_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 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:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
 if ${ac_cv_target+:} false; 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_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
 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:${as_lineno-$LINENO}: checking for working mkdir -p" >&5
 $as_echo_n "checking for working mkdir -p... " >&6; }
 if ${ac_cv_mkdir_p+:} false; 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:${as_lineno-$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
   # Catch layout names including a slash which will otherwise
   # confuse the heck out of the sed script.
   case $LAYOUT in
   */*)
     echo "** Error: $LAYOUT is not a valid layout name"
     exit 1 ;;
   esac
   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:${as_lineno-$LINENO}: checking for chosen layout" >&5
 $as_echo_n "checking for chosen layout... " >&6; }
 { $as_echo "$as_me:${as_lineno-$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_fn_error $? "expected an absolute path for --$ac_var: $ac_val" "$LINENO" 5;;
   esac
 done
 
 
 
 
 case "$host" in
   *-apple-aux3*)
 
   if test -z "$CC"; then
     test "x$silent" != "xyes" && echo "  setting CC to \"gcc\""
     CC="gcc"
   fi
 
       ;;
   bs2000*-siemens-sysv*)
 
   if test -z "$CC"; then
     test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && echo "  setting CC to \"cc\""
     CC="cc"
   fi
 
       ;;
   *-ibm-os390)
 
   if test -z "$CC"; then
     test "x$silent" != "xyes" && echo "  setting CC to \"cc\""
     CC="cc"
   fi
 
       ;;
   *-ibm-as400)
 
   if test -z "$CC"; then
     test "x$silent" != "xyes" && echo "  setting CC to \"icc\""
     CC="icc"
   fi
 
       ;;
   *-isc4*)
 
   if test -z "$CC"; then
     test "x$silent" != "xyes" && echo "  setting CC to \"gcc\""
     CC="gcc"
   fi
 
       ;;
   m88k-*-CX/SX|CYBER)
 
   if test -z "$CC"; then
     test "x$silent" != "xyes" && echo "  setting CC to \"cc\""
     CC="cc"
   fi
 
       ;;
   *-next-openstep*)
 
   if test -z "$CC"; then
     test "x$silent" != "xyes" && echo "  setting CC to \"cc\""
     CC="cc"
   fi
 
       ;;
   *-qnx32)
 
   if test -z "$CC"; then
     test "x$silent" != "xyes" && echo "  setting CC to \"cc -F\""
     CC="cc -F"
   fi
 
       ;;
   *-tandem-oss)
 
   if test -z "$CC"; then
     test "x$silent" != "xyes" && echo "  setting CC to \"c89\""
     CC="c89"
   fi
 
       ;;
   TPF)
 
   if test -z "$CC"; then
     test "x$silent" != "xyes" && 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_CC+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; 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 as_fn_executable_p "$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:${as_lineno-$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:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_CC+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     sed '10a\
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 $as_echo_n "checking whether the C compiler works... " >&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:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; 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
 if test -z "$ac_file"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 $as_echo_n "checking for C compiler default output file name... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; 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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
 main ()
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 $as_echo_n "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { 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:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 $as_echo "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; 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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$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 ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 #ifndef __GNUC__
        choke me
 #endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
   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:${as_lineno-$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:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
 if ${ac_cv_prog_cc_g+:} false; 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 else
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
 struct stat;
 /* 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"
   if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
 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:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 if test "x$ac_cv_prog_cc_c89" != xno; then :
 
 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:${as_lineno-$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 ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
      { ac_script=; unset ac_script;}
      if test -z "$SED"; then
   ac_path_SED_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
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_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 '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_SED_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_SED="$ac_path_SED"
       ac_path_SED_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_SED_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
     as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
 
 
 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
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-DMINT -D_GNU_SOURCE\""
     CPPFLAGS="-DMINT -D_GNU_SOURCE"
   else
     apr_addto_bugger="-DMINT -D_GNU_SOURCE"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *MPE/iX*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 
   if test "x$LDFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-apple-aux3*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 
   if test "x$LDFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
 
   test "x$silent" != "xyes" && echo "  forcing SHELL to \"/bin/ksh\""
   SHELL="/bin/ksh"
 
 	;;
     *-ibm-aix*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
                 case $host in
             *-ibm-aix4.3)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	        ;;
             *-ibm-aix5*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	        ;;
             *-ibm-aix4.3.*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && echo "  setting AIX_XLC to \"yes\""
     AIX_XLC="yes"
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
         fi
 
   if test -z "$apr_sysvsem_is_global"; then
     test "x$silent" != "xyes" && echo "  setting apr_sysvsem_is_global to \"yes\""
     apr_sysvsem_is_global="yes"
   fi
 
 
   if test -z "$apr_lock_method"; then
     test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
                 ;;
 	esac
         ;;
     *-apollo-*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-dg-dgux*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-os2*)
 
   test "x$silent" != "xyes" && echo "  forcing SHELL to \"sh\""
   SHELL="sh"
 
 
   if test -z "$apr_gethostbyname_is_thread_safe"; then
     test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && echo "  setting apr_gethostbyaddr_is_thread_safe to \"yes\""
     apr_gethostbyaddr_is_thread_safe="yes"
   fi
 
 
   if test -z "$apr_getservbyname_is_thread_safe"; then
     test "x$silent" != "xyes" && echo "  setting apr_getservbyname_is_thread_safe to \"yes\""
     apr_getservbyname_is_thread_safe="yes"
   fi
 
 	;;
     *-hi-hiux)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-hp-hpux11.*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-DHPUX11 -D_REENTRANT -D_HPUX_SOURCE\""
     CPPFLAGS="-DHPUX11 -D_REENTRANT -D_HPUX_SOURCE"
   else
     apr_addto_bugger="-DHPUX11 -D_REENTRANT -D_HPUX_SOURCE"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-hp-hpux10.*)
  	case $host in
  	  *-hp-hpux10.01)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	       ;;
  	esac
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-hp-hpux*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-linux*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-DLINUX -D_REENTRANT -D_GNU_SOURCE\""
     CPPFLAGS="-DLINUX -D_REENTRANT -D_GNU_SOURCE"
   else
     apr_addto_bugger="-DLINUX -D_REENTRANT -D_GNU_SOURCE"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-lynx-lynxos)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *486-*-bsdi*)
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-*-bsdi*)
         case $host in
             *bsdi4.1)
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
                 ;;
         esac
         ;;
     *-openbsd*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
         # binding to an ephemeral port fails on OpenBSD so override
         # the test for O_NONBLOCK inheritance across accept().
 
   if test -z "$ac_cv_o_nonblock_inherited"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_o_nonblock_inherited to \"yes\""
     ac_cv_o_nonblock_inherited="yes"
   fi
 
 	;;
     *-netbsd*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && echo "  setting ac_cv_o_nonblock_inherited to \"yes\""
     ac_cv_o_nonblock_inherited="yes"
   fi
 
 	;;
     *-freebsd*)
 
   if test -z "$apr_lock_method"; then
     test "x$silent" != "xyes" && echo "  setting apr_lock_method to \"USE_FLOCK_SERIALIZE\""
     apr_lock_method="USE_FLOCK_SERIALIZE"
   fi
 
         if test -x /sbin/sysctl; then
             os_version=`/sbin/sysctl -n kern.osreldate`
         else
             os_version=000000
         fi
         # 502102 is when libc_r switched to libpthread (aka libkse).
         if test $os_version -ge "502102"; then
           apr_cv_pthreads_cflags="none"
           apr_cv_pthreads_lib="-lpthread"
         else
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-D_THREAD_SAFE -D_REENTRANT\""
     CPPFLAGS="-D_THREAD_SAFE -D_REENTRANT"
   else
     apr_addto_bugger="-D_THREAD_SAFE -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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test -z "$enable_threads"; then
     test "x$silent" != "xyes" && echo "  setting enable_threads to \"no\""
     enable_threads="no"
   fi
 
         fi
         # prevent use of KQueue before FreeBSD 4.8
         if test $os_version -lt "480000"; then
 
   if test -z "$ac_cv_func_kqueue"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_func_kqueue to \"no\""
     ac_cv_func_kqueue="no"
   fi
 
         fi
 	;;
     *-k*bsd*-gnu)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-D_REENTRANT -D_GNU_SOURCE\""
     CPPFLAGS="-D_REENTRANT -D_GNU_SOURCE"
   else
     apr_addto_bugger="-D_REENTRANT -D_GNU_SOURCE"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
         ;;
     *-gnu*|*-GNU*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-D_REENTRANT -D_GNU_SOURCE -DHURD\""
     CPPFLAGS="-D_REENTRANT -D_GNU_SOURCE -DHURD"
   else
     apr_addto_bugger="-D_REENTRANT -D_GNU_SOURCE -DHURD"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
         ;;
     *-next-nextstep*)
 
   if test -z "$CFLAGS"; then
     test "x$silent" != "xyes" && echo "  setting CFLAGS to \"-O\""
     CFLAGS="-O"
   fi
 
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-next-openstep*)
 
   if test -z "$CFLAGS"; then
     test "x$silent" != "xyes" && echo "  setting CFLAGS to \"-O\""
     CFLAGS="-O"
   fi
 
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-apple-rhapsody*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-apple-darwin*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK\""
     CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
   else
     apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test -z "$apr_posixsem_is_global"; then
     test "x$silent" != "xyes" && echo "  setting apr_posixsem_is_global to \"yes\""
     apr_posixsem_is_global="yes"
   fi
 
         case $host in
             *-apple-darwin[1-9].*)
                 # APR's use of kqueue has triggered kernel panics for some
                 # 10.5.x (Darwin 9.x) users when running the entire test suite.
                 # In 10.4.x, use of kqueue would cause the socket tests to hang.
                 # 10.6+ (Darwin 10.x is supposed to fix the KQueue issues
 
   if test -z "$ac_cv_func_kqueue"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_func_kqueue to \"no\""
     ac_cv_func_kqueue="no"
   fi
 
 
   if test -z "$ac_cv_func_poll"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_func_poll to \"no\""
     ac_cv_func_poll="no"
   fi
  # See issue 34332
             ;;
             *-apple-darwin1?.*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-DDARWIN_10\""
     CPPFLAGS="-DDARWIN_10"
   else
     apr_addto_bugger="-DDARWIN_10"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
             ;;
         esac
 	;;
     *-dec-osf*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-qnx32)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-isc4*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LDFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"-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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting LIBS to \"-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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-sco3.2v[234]*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	if test "$GCC" = "no"; then
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 	fi
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-sco3.2v5*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-sco_sv*|*-SCO_SV*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-solaris2*)
     	PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'`
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
+        if test $PLATOSVERS -eq 10; then
+            # pthread_mutex_timedlock is broken on Solaris 10.
+            # It can block without timeout in case of EDEADLK.
+
+  if test -z "$ac_cv_func_pthread_mutex_timedlock"; then
+    test "x$silent" != "xyes" && echo "  setting ac_cv_func_pthread_mutex_timedlock to \"no\""
+    ac_cv_func_pthread_mutex_timedlock="no"
+  fi
+
+        fi
         if test $PLATOSVERS -ge 10; then
 
   if test -z "$apr_lock_method"; then
     test "x$silent" != "xyes" && echo "  setting apr_lock_method to \"USE_PROC_PTHREAD_SERIALIZE\""
     apr_lock_method="USE_PROC_PTHREAD_SERIALIZE"
   fi
 
         else
 
   if test -z "$apr_lock_method"; then
     test "x$silent" != "xyes" && echo "  setting apr_lock_method to \"USE_FCNTL_SERIALIZE\""
     apr_lock_method="USE_FCNTL_SERIALIZE"
   fi
 
         fi
         # readdir64_r error handling seems broken on Solaris (at least
         # up till 2.8) -- it will return -1 at end-of-directory.
 
   if test -z "$ac_cv_func_readdir64_r"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_func_readdir64_r to \"no\""
     ac_cv_func_readdir64_r="no"
   fi
 
 	;;
     *-sunos4*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-unixware1)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-unixware2)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-unixware211)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-unixware212)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-unixware7)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     maxion-*-sysv4*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-*-powermax*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     TPF)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
        ;;
     bs2000*-siemens-sysv*)
 
   if test -z "$CFLAGS"; then
     test "x$silent" != "xyes" && echo "  setting CFLAGS to \"-O\""
     CFLAGS="-O"
   fi
 
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 
   if test -z "$enable_threads"; then
     test "x$silent" != "xyes" && echo "  setting enable_threads to \"no\""
     enable_threads="no"
   fi
 
 	;;
     *-siemens-sysv4*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     pyramid-pyramid-svr4)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     DS/90\ 7000-*-sysv4*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-tandem-sysv4*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-ncr-sysv4)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-sysv4*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     88k-encore-sysv4)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	        ;;
 	    *)
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 	        ;;
 	esac
 	;;
     *-ultrix)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   test "x$silent" != "xyes" && echo "  forcing SHELL to \"/bin/sh5\""
   SHELL="/bin/sh5"
 
 	;;
     *powerpc-tenon-machten*)
 
   if test "x$LDFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-machten*)
 
   if test "x$LDFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
 	;;
     *convex-v11*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test -z "$CFLAGS"; then
     test "x$silent" != "xyes" && echo "  setting CFLAGS to \"-O1\""
     CFLAGS="-O1"
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 	;;
     i860-intel-osf1)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-sequent-ptx2.*.*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-sequent-ptx4.0.*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-sequent-ptx4.[123].*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-sequent-ptx4.4.*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-sequent-ptx4.5.*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *-sequent-ptx5.0.*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     *NEWS-OS*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-riscix)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test -z "$CFLAGS"; then
     test "x$silent" != "xyes" && echo "  setting CFLAGS to \"-O\""
     CFLAGS="-O"
   fi
 
 	;;
     *-irix*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *beos*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
         PLATOSVERS=`uname -r`
 
   if test -z "$apr_process_lock_is_global"; then
     test "x$silent" != "xyes" && echo "  setting apr_process_lock_is_global to \"yes\""
     apr_process_lock_is_global="yes"
   fi
 
         case $PLATOSVERS in
             5.0.4)
 
   if test "x$LDFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting LIBS to \"-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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
                 ;;
             5.1)
 
   if test "x$LDFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting LIBS to \"-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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
                 ;;
 	esac
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-DSIGPROCMASK_SETS_THREAD_MASK\""
     CPPFLAGS="-DSIGPROCMASK_SETS_THREAD_MASK"
   else
     apr_addto_bugger="-DSIGPROCMASK_SETS_THREAD_MASK"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
         ;;
     4850-*.*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     drs6000*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 	;;
     m88k-*-CX/SX|CYBER)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-tandem-oss)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 	;;
     *-ibm-os390)
 
   if test -z "$apr_lock_method"; then
     test "x$silent" != "xyes" && echo "  setting apr_lock_method to \"USE_SYSVSEM_SERIALIZE\""
     apr_lock_method="USE_SYSVSEM_SERIALIZE"
   fi
 
 
   if test -z "$apr_sysvsem_is_global"; then
     test "x$silent" != "xyes" && echo "  setting apr_sysvsem_is_global to \"yes\""
     apr_sysvsem_is_global="yes"
   fi
 
 
   if test -z "$apr_gethostbyname_is_thread_safe"; then
     test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && echo "  setting apr_gethostbyaddr_is_thread_safe to \"yes\""
     apr_gethostbyaddr_is_thread_safe="yes"
   fi
 
 
   if test -z "$apr_getservbyname_is_thread_safe"; then
     test "x$silent" != "xyes" && echo "  setting apr_getservbyname_is_thread_safe to \"yes\""
     apr_getservbyname_is_thread_safe="yes"
   fi
 
 
 $as_echo "#define HAVE_ZOS_PTHREADS 1" >>confdefs.h
 
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-U_NO_PROTO -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1\""
     CPPFLAGS="-U_NO_PROTO -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1"
   else
     apr_addto_bugger="-U_NO_PROTO -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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
         ;;
     *-ibm-as400)
 
   if test -z "$apr_lock_method"; then
     test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && echo "  setting apr_gethostbyaddr_is_thread_safe to \"yes\""
     apr_gethostbyaddr_is_thread_safe="yes"
   fi
 
 
   if test -z "$apr_getservbyname_is_thread_safe"; then
     test "x$silent" != "xyes" && echo "  setting apr_getservbyname_is_thread_safe to \"yes\""
     apr_getservbyname_is_thread_safe="yes"
   fi
 
         ;;
     *mingw*)
 
   if test "x$INTERNAL_CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting INTERNAL_CPPFLAGS to \"-DBINPATH=$apr_builddir/test/.libs\""
     INTERNAL_CPPFLAGS="-DBINPATH=$apr_builddir/test/.libs"
   else
     apr_addto_bugger="-DBINPATH=$apr_builddir/test/.libs"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $INTERNAL_CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to INTERNAL_CPPFLAGS"
         INTERNAL_CPPFLAGS="$INTERNAL_CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-DWIN32 -D__MSVCRT__\""
     CPPFLAGS="-DWIN32 -D__MSVCRT__"
   else
     apr_addto_bugger="-DWIN32 -D__MSVCRT__"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LDFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"-Wl,--enable-auto-import,--subsystem,console\""
     LDFLAGS="-Wl,--enable-auto-import,--subsystem,console"
   else
     apr_addto_bugger="-Wl,--enable-auto-import,--subsystem,console"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $LDFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
 
   if test -z "$have_unicode_fs"; then
     test "x$silent" != "xyes" && echo "  setting have_unicode_fs to \"1\""
     have_unicode_fs="1"
   fi
 
 
   if test -z "$have_proc_invoked"; then
     test "x$silent" != "xyes" && echo "  setting have_proc_invoked to \"1\""
     have_proc_invoked="1"
   fi
 
 
   if test -z "$apr_lock_method"; then
     test "x$silent" != "xyes" && echo "  setting apr_lock_method to \"win32\""
     apr_lock_method="win32"
   fi
 
 
   if test -z "$apr_process_lock_is_global"; then
     test "x$silent" != "xyes" && echo "  setting apr_process_lock_is_global to \"yes\""
     apr_process_lock_is_global="yes"
   fi
 
 
   if test -z "$apr_cv_use_lfs64"; then
     test "x$silent" != "xyes" && echo "  setting apr_cv_use_lfs64 to \"yes\""
     apr_cv_use_lfs64="yes"
   fi
 
 
   if test -z "$apr_cv_osuuid"; then
     test "x$silent" != "xyes" && echo "  setting apr_cv_osuuid to \"yes\""
     apr_cv_osuuid="yes"
   fi
 
 
   if test -z "$apr_cv_tcp_nodelay_with_cork"; then
     test "x$silent" != "xyes" && echo "  setting apr_cv_tcp_nodelay_with_cork to \"no\""
     apr_cv_tcp_nodelay_with_cork="no"
   fi
 
 
   if test -z "$apr_thread_func"; then
     test "x$silent" != "xyes" && echo "  setting apr_thread_func to \"__stdcall\""
     apr_thread_func="__stdcall"
   fi
 
 
   if test -z "$ac_cv_o_nonblock_inherited"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_o_nonblock_inherited to \"yes\""
     ac_cv_o_nonblock_inherited="yes"
   fi
 
 
   if test -z "$ac_cv_tcp_nodelay_inherited"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_tcp_nodelay_inherited to \"yes\""
     ac_cv_tcp_nodelay_inherited="yes"
   fi
 
 
   if test -z "$ac_cv_file__dev_zero"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_file__dev_zero to \"no\""
     ac_cv_file__dev_zero="no"
   fi
 
 
   if test -z "$ac_cv_func_setpgrp_void"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_func_setpgrp_void to \"no\""
     ac_cv_func_setpgrp_void="no"
   fi
 
 
   if test -z "$ac_cv_func_mmap"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_func_mmap to \"yes\""
     ac_cv_func_mmap="yes"
   fi
 
 
   if test -z "$ac_cv_define_sockaddr_in6"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_define_sockaddr_in6 to \"yes\""
     ac_cv_define_sockaddr_in6="yes"
   fi
 
 
   if test -z "$ac_cv_working_getaddrinfo"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_working_getaddrinfo to \"yes\""
     ac_cv_working_getaddrinfo="yes"
   fi
 
 
   if test -z "$ac_cv_working_getnameinfo"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_working_getnameinfo to \"yes\""
     ac_cv_working_getnameinfo="yes"
   fi
 
 
   if test -z "$ac_cv_func_gai_strerror"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_func_gai_strerror to \"yes\""
     ac_cv_func_gai_strerror="yes"
   fi
 
         case $host in
             *mingw32*)
 
   if test -z "$apr_has_xthread_files"; then
     test "x$silent" != "xyes" && echo "  setting apr_has_xthread_files to \"1\""
     apr_has_xthread_files="1"
   fi
 
 
   if test -z "$apr_has_user"; then
     test "x$silent" != "xyes" && echo "  setting apr_has_user to \"1\""
     apr_has_user="1"
   fi
 
 
   if test -z "$apr_procattr_user_set_requires_password"; then
     test "x$silent" != "xyes" && echo "  setting apr_procattr_user_set_requires_password to \"1\""
     apr_procattr_user_set_requires_password="1"
   fi
 
 
   if test -z "$ac_cv_func_sendfile"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_func_sendfile to \"yes\""
     ac_cv_func_sendfile="yes"
   fi
 
                 ;;
             *mingwce)
 
   if test -z "$apr_has_xthread_files"; then
     test "x$silent" != "xyes" && echo "  setting apr_has_xthread_files to \"0\""
     apr_has_xthread_files="0"
   fi
 
 
   if test -z "$apr_has_user"; then
     test "x$silent" != "xyes" && echo "  setting apr_has_user to \"0\""
     apr_has_user="0"
   fi
 
 
   if test -z "$apr_procattr_user_set_requires_password"; then
     test "x$silent" != "xyes" && echo "  setting apr_procattr_user_set_requires_password to \"0\""
     apr_procattr_user_set_requires_password="0"
   fi
 
 
   if test -z "$ac_cv_func_sendfile"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_func_sendfile to \"no\""
     ac_cv_func_sendfile="no"
   fi
 
                 ;;
         esac
         ;;
   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 random"
 
 { $as_echo "$as_me:${as_lineno-$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 eval \${ac_cv_prog_make_${ac_make}_set+:} false; 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:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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 ${ac_cv_prog_CPP+:} false; 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 		     Syntax error
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
 
 else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i 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:${as_lineno-$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 		     Syntax error
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
 
 else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AWK+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_RANLIB+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_RANLIB+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if ${ac_cv_path_install+:} false; 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 as_fn_executable_p "$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_RM+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RM="rm"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $RM" >&5
 $as_echo "$RM" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AS+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="as"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $AS" >&5
 $as_echo "$AS" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ASCPP+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ASCPP="cpp"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ASCPP" >&5
 $as_echo "$ASCPP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AR+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_AR+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$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 ${ac_cv_path_GREP+:} false; 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"
       as_fn_executable_p "$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
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     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_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
 if ${ac_cv_path_EGREP+:} false; 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"
       as_fn_executable_p "$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
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     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_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
    fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
   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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
 
 else
   ac_cv_header_stdc=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 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`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
 
 
   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
 if test "x$ac_cv_header_minix_config_h" = xyes; then :
   MINIX=yes
 else
   MINIX=
 fi
 
 
   if test "$MINIX" = yes; then
 
 $as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
 
 $as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
 
 $as_echo "#define _MINIX 1" >>confdefs.h
 
   fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if ${ac_cv_safe_to_define___extensions__+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #         define __EXTENSIONS__ 1
           $ac_includes_default
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_safe_to_define___extensions__=yes
 else
   ac_cv_safe_to_define___extensions__=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$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 &&
     $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
 
   $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
 
   $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
 
   $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
 if ${ac_cv_search_strerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_strerror=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_strerror+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_strerror+:} false; then :
 
 else
   ac_cv_search_strerror=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5
 $as_echo_n "checking whether system uses EBCDIC... " >&6; }
 if ${ac_cv_ebcdic+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then :
 
   ac_cv_ebcdic="no"
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void) {
   return (unsigned char)'A' != (unsigned char)0xC1;
 }
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_ebcdic="yes"
 
 else
 
   ac_cv_ebcdic="no"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 
 if test "x$Xsed" = "x"; then
   Xsed="$SED -e 1s/^X//"
 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"
         $CC $CFLAGS $CPPFLAGS -o $LIBTOOL $LIBTOOL_SRC
         eval `$apr_builddir/libtool --config | grep "^shlibpath_var=[A-Z_]*$"`
         if test "x$shlibpath_var" = "x"; then
             shlibpath_var=REPLACE_WITH_YOUR_SHLIBPATH_VAR
         fi
     else
         enable_win32_dll=yes
 
 case $host in
 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AS+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $AS" >&5
 $as_echo "$AS" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_AS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AS"; then
   ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
 $as_echo "$ac_ct_AS" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
     AS="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
     AS=$ac_ct_AS
   fi
 else
   AS="$ac_cv_prog_AS"
 fi
 
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
 $as_echo "$DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
 $as_echo "$ac_ct_DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
     DLLTOOL="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
     DLLTOOL=$ac_ct_DLLTOOL
   fi
 else
   DLLTOOL="$ac_cv_prog_DLLTOOL"
 fi
 
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 $as_echo "$OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
 $as_echo "$ac_ct_OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
     OBJDUMP="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
     OBJDUMP=$ac_ct_OBJDUMP
   fi
 else
   OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
   ;;
 esac
 
 test -z "$AS" && AS=as
 
 
 
 
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
 
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
 
 
 
 
 case `pwd` in
   *\ * | *\	*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4.6'
+macro_revision='2.4.6'
 
 
 
 
 
 
 
 
 
 
 
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 # Backslashify metacharacters that are still active within
 # double-quoted strings.
 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 delay expansion of an escaped single quote.
 delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
 
 # Sed substitution to avoid accidental globbing in evaled expressions
 no_glob_subst='s/\*/\\\*/g'
 
 ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 $as_echo_n "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
    test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
   ECHO='print -r --'
 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
   ECHO='printf %s\n'
 else
   # Use this function as a fallback that always works.
   func_fallback_echo ()
   {
     eval 'cat <<_LTECHO_EOF
 $1
 _LTECHO_EOF'
   }
   ECHO='func_fallback_echo'
 fi
 
 # func_echo_all arg...
 # Invoke $ECHO with all args, space-separated.
 func_echo_all ()
 {
     $ECHO ""
 }
 
-case "$ECHO" in
+case $ECHO in
   printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
 $as_echo "printf" >&6; } ;;
   print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
 $as_echo "print -r" >&6; } ;;
   *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
 $as_echo "cat" >&6; } ;;
 esac
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$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 ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
      { ac_script=; unset ac_script;}
      if test -z "$SED"; then
   ac_path_SED_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
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_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 '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_SED_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_SED="$ac_path_SED"
       ac_path_SED_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_SED_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
     as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
 test -z "$SED" && SED=sed
 Xsed="$SED -e 1s/^X//"
 
 
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
 if ${ac_cv_path_FGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
    then ac_cv_path_FGREP="$GREP -F"
    else
      if test -z "$FGREP"; then
   ac_path_FGREP_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 fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_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 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_FGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_FGREP="$ac_path_FGREP"
       ac_path_FGREP_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_FGREP_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
     as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
 fi
 
    fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
 $as_echo "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
 
 test -z "$GREP" && GREP=grep
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 # 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
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 else
   with_gnu_ld=no
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
   { $as_echo "$as_me:${as_lineno-$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
+    # 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"
+      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
+elif test yes = "$with_gnu_ld"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if ${lt_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
+    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"
+      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 no != "$with_gnu_ld" && break
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
-  IFS="$lt_save_ifs"
+  IFS=$lt_save_ifs
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if ${lt_cv_prog_gnu_ld+:} false; 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:${as_lineno-$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:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if ${lt_cv_path_NM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  lt_cv_path_NM=$NM
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
+  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
+    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"
+      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
+      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:
+	# 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'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break
+	  break 2
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break
+	    break 2
 	    ;;
 	  *)
 	    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"
+    IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
   if test -n "$DUMPBIN"; then :
     # Let the user override the test.
   else
     if test -n "$ac_tool_prefix"; then
   for ac_prog in dumpbin "link -dump"
   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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
   ac_cv_prog_DUMPBIN="$DUMPBIN" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
 $as_echo "$DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
     test -n "$DUMPBIN" && break
   done
 fi
 if test -z "$DUMPBIN"; then
   ac_ct_DUMPBIN=$DUMPBIN
   for ac_prog in dumpbin "link -dump"
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
   ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
 $as_echo "$ac_ct_DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   test -n "$ac_ct_DUMPBIN" && break
 done
 
   if test "x$ac_ct_DUMPBIN" = x; then
     DUMPBIN=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
     DUMPBIN=$ac_ct_DUMPBIN
   fi
 fi
 
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
     *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
+      DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
     *)
       DUMPBIN=:
       ;;
     esac
   fi
 
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
 if ${lt_cv_nm_interface+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
   (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
   (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
   (eval echo "\"\$as_me:$LINENO: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
   fi
   rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 $as_echo "$lt_cv_nm_interface" >&6; }
 
 # find the maximum length of command line arguments
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
 if ${lt_cv_sys_max_cmd_len+:} false; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
-  teststring="ABCD"
+  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* | cegcc*)
     # 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;
     ;;
 
   mint*)
     # On MiNT this can take a long time and run out of memory.
     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*)
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
     # 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
     ;;
 
   os2*)
     # The test takes a long time on OS/2.
     lt_cv_sys_max_cmd_len=8192
     ;;
 
   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
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$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
       # Make teststring a little bigger before we do anything with it.
       # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
+      for i in 1 2 3 4 5 6 7 8; do
         teststring=$teststring$teststring
       done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
+	      test 17 != "$i" # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
       done
       # Only check the string length outside the loop.
       lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
       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
+if test -n "$lt_cv_sys_max_cmd_len"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
 $as_echo "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
 
 
 
 
 
 : ${CP="cp -f"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
   lt_unset=false
 fi
 
 
 
 
 
 # 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
   lt_SP2NL='tr \040 \012'
   lt_NL2SP='tr \015\012 \040\040'
   ;;
  *) # EBCDIC based system
   lt_SP2NL='tr \100 \n'
   lt_NL2SP='tr \r\n \100\100'
   ;;
 esac
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 $as_echo_n "checking how to convert $build file names to $host format... " >&6; }
 if ${lt_cv_to_host_file_cmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $host in
   *-*-mingw* )
     case $build in
       *-*-mingw* ) # actually msys
         lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
         ;;
       *-*-cygwin* )
         lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
         ;;
       * ) # otherwise, assume *nix
         lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
         ;;
     esac
     ;;
   *-*-cygwin* )
     case $build in
       *-*-mingw* ) # actually msys
         lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
         ;;
       *-*-cygwin* )
         lt_cv_to_host_file_cmd=func_convert_file_noop
         ;;
       * ) # otherwise, assume *nix
         lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
         ;;
     esac
     ;;
   * ) # unhandled hosts (and "normal" native builds)
     lt_cv_to_host_file_cmd=func_convert_file_noop
     ;;
 esac
 
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
 $as_echo "$lt_cv_to_host_file_cmd" >&6; }
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 $as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
 if ${lt_cv_to_tool_file_cmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   #assume ordinary cross tools, or native build.
 lt_cv_to_tool_file_cmd=func_convert_file_noop
 case $host in
   *-*-mingw* )
     case $build in
       *-*-mingw* ) # actually msys
         lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
         ;;
     esac
     ;;
 esac
 
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
 $as_echo "$lt_cv_to_tool_file_cmd" >&6; }
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
 if ${lt_cv_ld_reload_flag+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
 { $as_echo "$as_me:${as_lineno-$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
   cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       reload_cmds=false
     fi
     ;;
   darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
     ;;
 esac
 
 
 
 
 
 
 
 
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 $as_echo "$OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
 $as_echo "$ac_ct_OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
     OBJDUMP="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
     OBJDUMP=$ac_ct_OBJDUMP
   fi
 else
   OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if ${lt_cv_deplibs_check_method+:} false; 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.
+# '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.
+# that 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.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+  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
     # Keep this pattern in sync with the one in func_win32_libid.
     lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
 cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 
 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
-  ;;
-
 haiku*)
   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])(-bit)?( [LM]SB)? 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 glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | 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=pass_all
   ;;
 
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   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
   ;;
 
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
 if test "$build" = "$host"; then
   case $host_os in
   mingw* | pw32*)
     if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
       want_nocaseglob=yes
     else
       file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
     fi
     ;;
   esac
 fi
 
 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 test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
 $as_echo "$DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
 $as_echo "$ac_ct_DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
     DLLTOOL="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
     DLLTOOL=$ac_ct_DLLTOOL
   fi
 else
   DLLTOOL="$ac_cv_prog_DLLTOOL"
 fi
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 $as_echo_n "checking how to associate runtime and link libraries... " >&6; }
 if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_sharedlib_from_linklib_cmd='unknown'
 
 case $host_os in
 cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
   case `$DLLTOOL --help 2>&1` in
   *--identify-strict*)
     lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
     ;;
   *)
     lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
     ;;
   esac
   ;;
 *)
   # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
   ;;
 esac
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
 $as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
 
 
 
 
 
 
 if test -n "$ac_tool_prefix"; then
   for ac_prog in ar
   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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AR+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
     test -n "$AR" && break
   done
 fi
 if test -z "$AR"; then
   ac_ct_AR=$AR
   for ac_prog in ar
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_AR+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   test -n "$ac_ct_AR" && break
 done
 
   if test "x$ac_ct_AR" = x; then
     AR="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
 fi
 
 : ${AR=ar}
 : ${AR_FLAGS=cru}
 
 
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 $as_echo_n "checking for archiver @FILE support... " >&6; }
 if ${lt_cv_ar_at_file+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ar_at_file=no
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   echo conftest.$ac_objext > conftest.lst
       lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
+      if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
 	rm -f conftest.$ac_objext libconftest.a
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
+	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
         fi
       fi
       rm -f conftest.* libconftest.a
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 $as_echo "$lt_cv_ar_at_file" >&6; }
 
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
 else
   archiver_list_spec=$lt_cv_ar_at_file
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_STRIP+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_STRIP+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
 
 test -z "$STRIP" && STRIP=:
 
 
 
 
 
 
 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_RANLIB+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_RANLIB+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
 
 test -z "$RANLIB" && RANLIB=:
 
 
 
 
 
 
 # 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*)
+  bitrig* | openbsd*)
     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
   darwin*)
     lock_old_archive_extraction=yes ;;
   *)
     lock_old_archive_extraction=no ;;
 esac
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 # 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 for command to grab the raw symbol name followed by C symbol from nm.
 { $as_echo "$as_me:${as_lineno-$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 ${lt_cv_sys_global_symbol_pipe+:} false; 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]*\)'
 
 # Define system-specific variables.
 case $host_os in
 aix*)
   symcode='[BCDT]'
   ;;
 cygwin* | mingw* | pw32* | cegcc*)
   symcode='[ABCDGISTW]'
   ;;
 hpux*)
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     symcode='[ABCDEGRST]'
   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
 
 # If we're using GNU nm, then use its standard symbol codes.
 case `$NM -V 2>&1` in
 *GNU* | *'with BFD'*)
   symcode='[ABCDGIRSTW]' ;;
 esac
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-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_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \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\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
 
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
 # 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
 
 # Try without a prefix underscore, 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.
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 "     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
   lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
 
   rm -f conftest*
   cat > conftest.$ac_ext <<_LT_EOF
 #ifdef __cplusplus
 extern "C" {
 #endif
 char nm_test_var;
 void nm_test_func(void);
 void nm_test_func(void){}
 #ifdef __cplusplus
 }
 #endif
 int main(){nm_test_var='a';nm_test_func();return(0);}
 _LT_EOF
 
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { { eval echo "\"\$as_me\":${as_lineno-$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && 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 <<_LT_EOF > conftest.$ac_ext
 /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data.  */
 # define LT_DLSYM_CONST
 #else
 # define LT_DLSYM_CONST const
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 _LT_EOF
 	  # Now generate the symbol file.
 	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
 
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
 LT_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
 lt__PROGRAM__LTX_preloaded_symbols[] =
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
 
 /* This works around a problem in FreeBSD linker */
 #ifdef FREEBSD_WORKAROUND
 static const void *lt_preloaded_setup() {
   return lt__PROGRAM__LTX_preloaded_symbols;
 }
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
 	  lt_globsym_save_LIBS=$LIBS
 	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
+	  LIBS=conftstm.$ac_objext
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
 	  LIBS=$lt_globsym_save_LIBS
 	  CFLAGS=$lt_globsym_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
+  if test yes = "$pipe_works"; 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:${as_lineno-$LINENO}: result: failed" >&5
 $as_echo "failed" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
 fi
 
 # Response file support.
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   nm_file_list_spec='@'
 elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
   nm_file_list_spec='@'
 fi
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 $as_echo_n "checking for sysroot... " >&6; }
 
 # Check whether --with-sysroot was given.
 if test "${with_sysroot+set}" = set; then :
   withval=$with_sysroot;
 else
   with_sysroot=no
 fi
 
 
 lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
  yes)
-   if test "$GCC" = yes; then
+   if test yes = "$GCC"; then
      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
    fi
    ;; #(
  /*)
    lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
    ;; #(
  no|'')
    ;; #(
  *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
 $as_echo "${lt_sysroot:-no}" >&6; }
 
 
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_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
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
 # 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
+test no = "$enable_libtool_lock" || 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.
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
-	HPUX_IA64_MODE="32"
+	HPUX_IA64_MODE=32
 	;;
       *ELF-64*)
-	HPUX_IA64_MODE="64"
+	HPUX_IA64_MODE=64
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
+    if test yes = "$lt_cv_prog_gnu_ld"; 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*| \
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; 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"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  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*)
 	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*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
 	    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"
+  SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 if ${lt_cv_cc_needs_belf+:} false; 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_cc_needs_belf=yes
 else
   lt_cv_cc_needs_belf=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     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:${as_lineno-$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
+  if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
+    CFLAGS=$SAVE_CFLAGS
   fi
   ;;
 *-*solaris*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*)
         case $host in
-        i?86-*-solaris*)
+        i?86-*-solaris*|x86_64-*-solaris*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
         sparc*-*-solaris*)
           LD="${LD-ld} -m elf64_sparc"
           ;;
         esac
         # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
         if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
+          LD=${LD-ld}_sol2
         fi
         ;;
       *)
 	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"
+need_locks=$enable_libtool_lock
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MANIFEST_TOOL"; then
   ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
 $as_echo "$MANIFEST_TOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_MANIFEST_TOOL"; then
   ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
 $as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
     MANIFEST_TOOL=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
   fi
 else
   MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 $as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if ${lt_cv_path_mainfest_tool+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_path_mainfest_tool=no
   echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
   $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
   cat conftest.err >&5
   if $GREP 'Manifest Tool' conftest.out > /dev/null; then
     lt_cv_path_mainfest_tool=yes
   fi
   rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
 $as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
   MANIFEST_TOOL=:
 fi
 
 
 
 
 
 
   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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_DSYMUTIL+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
 $as_echo "$DSYMUTIL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
 $as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_NMEDIT+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $NMEDIT" >&5
 $as_echo "$NMEDIT" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_NMEDIT+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
 $as_echo "$ac_ct_NMEDIT" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
 
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
   ac_cv_prog_LIPO="$LIPO" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
 $as_echo "$LIPO" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
   ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
 $as_echo "$ac_ct_LIPO" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
     LIPO=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
     LIPO=$ac_ct_LIPO
   fi
 else
   LIPO="$ac_cv_prog_LIPO"
 fi
 
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
   ac_cv_prog_OTOOL="$OTOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
 $as_echo "$OTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
   ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
 $as_echo "$ac_ct_OTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
     OTOOL=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
     OTOOL=$ac_ct_OTOOL
   fi
 else
   OTOOL="$ac_cv_prog_OTOOL"
 fi
 
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
   ac_cv_prog_OTOOL64="$OTOOL64" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
 $as_echo "$OTOOL64" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
   ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
 $as_echo "$ac_ct_OTOOL64" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
     OTOOL64=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$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
     OTOOL64=$ac_ct_OTOOL64
   fi
 else
   OTOOL64="$ac_cv_prog_OTOOL64"
 fi
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
 if ${lt_cv_apple_cc_single_mod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
+      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.
 	rm -rf libconftest.dylib*
 	echo "int foo(void){return 1;}" > conftest.c
 	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 -dynamiclib -Wl,-single_module conftest.c" >&5
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
 	# If there is a non-empty error log, and "single_module"
 	# appears in it, assume the flag caused a linker warning
         if test -s conftest.err && $GREP single_module conftest.err; then
 	  cat conftest.err >&5
 	# Otherwise, if the output was created with a 0 exit code from
 	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
 	fi
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_ld_exported_symbols_list=yes
 else
   lt_cv_ld_exported_symbols_list=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
 int forced_loaded() { return 2;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
       echo "$AR cru libconftest.a conftest.o" >&5
       $AR cru libconftest.a conftest.o 2>&5
       echo "$RANLIB libconftest.a" >&5
       $RANLIB libconftest.a 2>&5
       cat > conftest.c << _LT_EOF
 int main() { return 0;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
       if test -s conftest.err && $GREP force_load conftest.err; then
 	cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
       fi
         rm -f conftest.err libconftest.a conftest conftest.c
         rm -rf conftest.dSYM
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
 $as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
     darwin*) # darwin 5.x on
       # 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' ;;
+	  _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' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+    if test yes = "$lt_cv_apple_cc_single_mod"; 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'
+    if test yes = "$lt_cv_ld_exported_symbols_list"; 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}'
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
     fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
     fi
     ;;
   esac
 
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
 for ac_header in dlfcn.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DLFCN_H 1
 _ACEOF
 
 fi
 
 done
 
 
 
 
 
 # Set options
 
 
 
         enable_dlopen=no
 
 
 
             # 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,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      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,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
   enable_static=yes
 fi
 
 
 
 
 
 
 
 
 
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
   withval=$with_pic; lt_p=${PACKAGE-default}
     case $withval in
     yes|no) pic_mode=$withval ;;
     *)
       pic_mode=default
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$lt_pkg" = "X$lt_p"; then
 	  pic_mode=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
   pic_mode=default
 fi
 
 
-test -z "$pic_mode" && pic_mode=default
 
 
 
 
 
 
-
   # 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,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
   enable_fast_install=yes
 fi
 
 
 
 
 
 
 
 
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
 
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
 
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(apr_builddir)/libtool'
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 test -z "$LN_S" && LN_S="ln -s"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
 if ${lt_cv_objdir+:} false; 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:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
 $as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
 
 
 
 cat >>confdefs.h <<_ACEOF
 #define LT_OBJDIR "$lt_cv_objdir/"
 _ACEOF
 
 
 
 
 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
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
   ;;
 esac
 
 # Global variables:
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
 test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$LD" && LD=ld
 test -z "$ac_objext" && ac_objext=o
 
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
 # Only perform the check for file, if the check method requires it
 test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if ${lt_cv_path_MAGIC_CMD+:} false; 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_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
+  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"
+    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 -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"
+	  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 <<_LT_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
 
 _LT_EOF
 	  fi ;;
 	esac
       fi
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
 if ${lt_cv_path_MAGIC_CMD+:} false; 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_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
+  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"
+    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 -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"
+	  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 <<_LT_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
 
 _LT_EOF
 	  fi ;;
 	esac
       fi
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   else
     MAGIC_CMD=:
   fi
 fi
 
   fi
   ;;
 esac
 
 # Use C for the default configuration in the libtool script
 
-lt_save_CC="$CC"
+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 the default compiler, since it gets overwritten when the other
 # tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
 compiler_DEFAULT=$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...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $cc_basename in
   nvcc*)
     lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
   *)
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if ${lt_cv_prog_compiler_rtti_exceptions+:} false; 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"
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
    # 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:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $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 "$_lt_compiler_boilerplate" | $SED '/^$/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:${as_lineno-$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
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; 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=
 
 
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; 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
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       fi
+      lt_prog_compiler_pic='-fPIC'
       ;;
 
     amigaos*)
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
             lt_prog_compiler_pic='-fPIC'
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
       ;;
 
     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # 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'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
       # PIC is the default on this platform
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic='-fno-common'
       ;;
 
     haiku*)
       # PIC is the default for Haiku.
       # The "-static" flag exists, but is broken.
       lt_prog_compiler_static=
       ;;
 
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
       # sets the default TLS model and affects inlining.
       case $host_cpu in
       hppa*64*)
 	# +Z the default
 	;;
       *)
 	lt_prog_compiler_pic='-fPIC'
 	;;
       esac
       ;;
 
     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
       ;;
 
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
       lt_prog_compiler_pic='-fPIC -shared'
       ;;
 
     sysv4*MP*)
       if test -d /usr/nec; then
 	lt_prog_compiler_pic=-Kconform_pic
       fi
       ;;
 
     *)
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
 
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
       if test -n "$lt_prog_compiler_pic"; then
         lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
       fi
       ;;
     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
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # 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'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     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'
+      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'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
+      # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
       icc* | ifort*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
         ;;
       # Lahey Fortran 8.1.
       lf95*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
       nagfor*)
 	# NAG Fortran compiler
 	lt_prog_compiler_wl='-Wl,-Wl,,'
 	lt_prog_compiler_pic='-PIC'
 	lt_prog_compiler_static='-Bstatic'
 	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # 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'
         ;;
       xl* | bgxl* | bgf* | mpixl*)
 	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # 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=''
 	  ;;
 	*Sun\ F* | *Sun*Fortran*)
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Qoption ld '
 	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
         *Intel*\ [CF]*Compiler*)
 	  lt_prog_compiler_wl='-Wl,'
 	  lt_prog_compiler_pic='-fPIC'
 	  lt_prog_compiler_static='-static'
 	  ;;
 	*Portland\ Group*)
 	  lt_prog_compiler_wl='-Wl,'
 	  lt_prog_compiler_pic='-fpic'
 	  lt_prog_compiler_static='-Bstatic'
 	  ;;
 	esac
 	;;
       esac
       ;;
 
     newsos6)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       ;;
 
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
       lt_prog_compiler_pic='-fPIC -shared'
       ;;
 
     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* | sunf77* | sunf90* | sunf95*)
 	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
+      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
 
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic=
     ;;
   *)
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 if ${lt_cv_prog_compiler_pic+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
 $as_echo "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
   { $as_echo "$as_me:${as_lineno-$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 ${lt_cv_prog_compiler_pic_works+:} false; 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"
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
    # 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:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $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 "$_lt_compiler_boilerplate" | $SED '/^$/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:${as_lineno-$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
+if test yes = "$lt_cv_prog_compiler_pic_works"; 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
 
 
 
 
 
 
 
 
 
 
 
 #
 # 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:${as_lineno-$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 ${lt_cv_prog_compiler_static_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
+   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 "$_lt_linker_boilerplate" | $SED '/^$/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"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
+if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
 else
     lt_prog_compiler_static=
 fi
 
 
 
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$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 ${lt_cv_prog_compiler_c_o+:} false; 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:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
    echo "$as_me:$LINENO: \$? = $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 "$_lt_compiler_boilerplate" | $SED '/^$/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 ..
    $RM -r conftest
    $RM conftest*
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$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 ${lt_cv_prog_compiler_c_o+:} false; 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:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
    echo "$as_me:$LINENO: \$? = $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 "$_lt_compiler_boilerplate" | $SED '/^$/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 ..
    $RM -r conftest
    $RM conftest*
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$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;}
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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=
   always_export_symbols=no
   archive_cmds=
   archive_expsym_cmds=
   compiler_needs_object=no
   enable_shared_with_static_runtimes=no
   export_dynamic_flag_spec=
   export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   hardcode_automatic=no
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
   inherit_rpath=no
   link_all_deplibs=unknown
   module_cmds=
   module_expsym_cmds=
   old_archive_from_new_cmds=
   old_archive_from_expsyms_cmds=
   thread_safe_flag_spec=
   whole_archive_flag_spec=
   # 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'.
+  # 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=
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
     # 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
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   esac
 
   ld_shlibs=yes
 
   # On some targets, GNU ld is compatible enough with the native linker
   # that we're better off using the native interface for both.
   lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     case $host_os in
       aix*)
 	# The AIX port of GNU ld has always aspired to compatibility
 	# with the native linker.  However, as the warning in the GNU ld
 	# block says, versions before 2.19.5* couldn't really create working
 	# shared libraries, regardless of the interface used.
 	case `$LD -v 2>&1` in
 	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
 	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
 	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
 	  *)
 	    lt_use_gnu_ld_interface=yes
 	    ;;
 	esac
 	;;
       *)
 	lt_use_gnu_ld_interface=yes
 	;;
     esac
   fi
 
-  if test "$lt_use_gnu_ld_interface" = yes; then
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    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'
+    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'
+      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>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [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
+      if test ia64 != "$host_cpu"; then
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
 *** Warning: the GNU linker, at least up to release 2.19, 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 install binutils
 *** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
 *** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
       ;;
 
     amigaos*)
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
             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
         ;;
       esac
       ;;
 
     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'
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	ld_shlibs=no
       fi
       ;;
 
     cygwin* | mingw* | pw32* | cegcc*)
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
       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/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
       exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 
       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'
+        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, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; 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
       ;;
 
     haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       link_all_deplibs=yes
       ;;
 
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
+      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'
+      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* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
+      if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
       fi
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
+	 && test no = "$tmp_diet"
       then
 	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
 	pgf77* | pgf90* | pgf95* | pgfortran*)
 					# 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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$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' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
 	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
 	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
 	  ;;
 	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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
-        if test "x$supports_anon_versioning" = xyes; then
+        if test yes = "$supports_anon_versioning"; 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'
+            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
 
 	case $cc_basename in
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
+	  if test yes = "$supports_anon_versioning"; 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~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
       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 $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $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 <<_LT_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.
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $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
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** 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
 	;;
 	*)
 	  # 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.
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    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'
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    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
       ;;
 
     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 $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $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
+    if test no = "$ld_shlibs"; 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
+      if test yes = "$GCC" && 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
+      if test ia64 = "$host_cpu"; 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=""
+	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
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX 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") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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'
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | 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.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	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
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	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_direct_absolute=yes
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
 
-      if test "$GCC" = yes; then
+      if test yes = "$GCC"; 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`
+	  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'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; 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'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      export_dynamic_flag_spec='${wl}-bexpall'
+      export_dynamic_flag_spec='$wl-bexpall'
       # 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
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; 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.
-        if test "${lt_cv_aix_libpath+set}" = set; then
+        if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath_+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
 	  /^0/ {
 	      s/^0  *\([^ ]*\) *$/\1/
 	      p
 	  }
       }'
   lt_cv_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 "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
+    lt_cv_aix_libpath_=/usr/lib:/lib
   fi
 
 fi
 
   aix_libpath=$lt_cv_aix_libpath_
 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 func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        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 -n "$allow_undefined_flag"; then func_echo_all "$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'
+	if test ia64 = "$host_cpu"; 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"
+	  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.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
+	 if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath_+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
 	  /^0/ {
 	      s/^0  *\([^ ]*\) *$/\1/
 	      p
 	  }
       }'
   lt_cv_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 "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
+    lt_cv_aix_libpath_=/usr/lib:/lib
   fi
 
 fi
 
   aix_libpath=$lt_cv_aix_libpath_
 fi
 
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 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'
-	  if test "$with_gnu_ld" = yes; then
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
 	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
 	  else
 	    # Exported symbols can be pulled into shared objects from archives
 	    whole_archive_flag_spec='$convenience'
 	  fi
 	  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'
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
 
     amigaos*)
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
             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
         ;;
       esac
       ;;
 
     bsdi[45]*)
       export_dynamic_flag_spec=-rdynamic
       ;;
 
     cygwin* | mingw* | pw32* | cegcc*)
       # 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.
       case $cc_basename in
       cl*)
 	# Native MSVC
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
 	file_list_spec='@'
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
 	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
 	postlink_cmds='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
 	;;
       *)
 	# Assume MSVC wrapper
 	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"
+	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
 	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''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'
 	enable_shared_with_static_runtimes=yes
 	;;
       esac
       ;;
 
     darwin* | rhapsody*)
 
 
   archive_cmds_need_lc=no
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 
   else
     whole_archive_flag_spec=''
   fi
   link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
+  allow_undefined_flag=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
+  if test yes = "$_lt_dar_can_shared"; then
     output_verbose_link_cmd=func_echo_all
-    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}"
+    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
   ld_shlibs=no
   fi
 
       ;;
 
     dgux*)
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_shlibpath_var=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 $pic_flag -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 $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$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'
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      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'
+      export_dynamic_flag_spec='$wl-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $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'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
+	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 && test "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag $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'
+	  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+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
 
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 $as_echo_n "checking if $CC understands -b... " >&6; }
 if ${lt_cv_prog_compiler__b+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS -b"
    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 "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
        lt_cv_prog_compiler__b=yes
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
 $as_echo "$lt_cv_prog_compiler__b" >&6; }
 
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $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
 
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 
 	case $host_cpu in
 	hppa*64*|ia64*)
 	  hardcode_direct=no
 	  hardcode_shlibpath_var=no
 	  ;;
 	*)
 	  hardcode_direct=yes
 	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
+	  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 $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if ${lt_cv_irix_exported_symbol+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo (void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_irix_exported_symbol=yes
 else
   lt_cv_irix_exported_symbol=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
+           LDFLAGS=$save_LDFLAGS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
 $as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       inherit_rpath=yes
       link_all_deplibs=yes
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     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_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_shlibpath_var=no
       ;;
 
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	hardcode_direct=yes
 	hardcode_shlibpath_var=no
 	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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'
+	  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
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	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'
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
       ;;
 
     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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      if test yes = "$GCC"; 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" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      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} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$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='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-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; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_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
       archive_cmds_need_lc='no'
       hardcode_libdir_separator=:
       ;;
 
     solaris*)
       no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $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 $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  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'
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $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 -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       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 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'
+	if test yes = "$GCC"; 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
+      if test sequent = "$host_vendor"; 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'
+	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'
+      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'
+      if test yes = "$GCC"; 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'
+	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
+      # Note: We CANNOT 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'
+      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='${wl}-R,$libdir'
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
+      export_dynamic_flag_spec='$wl-Bexport'
       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'
+      if test yes = "$GCC"; 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'
+	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
       ;;
 
     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
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	export_dynamic_flag_spec='$wl-Blargedynsym'
 	;;
       esac
     fi
   fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 #
 # 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
+  if test yes,yes = "$GCC,$enable_shared"; 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:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
 if ${lt_cv_archive_cmds_need_lc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   $RM conftest*
 	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 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\":${as_lineno-$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
 	  else
 	    lt_cv_archive_cmds_need_lc=yes
 	  fi
 	  allow_undefined_flag=$lt_save_allow_undefined_flag
 	else
 	  cat conftest.err 1>&5
 	fi
 	$RM conftest*
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
 $as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
   fi
   ;;
 esac
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
   esac
   case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
   esac
   lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
   case $lt_search_path_spec in
   *\;*)
     # 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 's/;/ /g'`
     ;;
   *)
     lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
     ;;
   esac
   # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
+  # 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`
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
   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
+    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"
+    elif test -n "$lt_multi_os_dir"; then
       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;
+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;
+          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; }
 }'`
   # AWK program above erroneously prepends '/' to C:/dos/paths
   # for these hosts.
   case $host_os in
     mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
   esac
   sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+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 # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  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'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[4-9]*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    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
+    # 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
+	   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
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot 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
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # 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
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
       # 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
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
 
 amigaos*)
   case $host_cpu in
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     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=`func_echo_all "$lib" | $SED '\''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'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $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'
     ;;
   esac
   ;;
 
 beos*)
-  library_names_spec='${libname}${shared_ext}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
 bsdi[45]*)
   version_type=linux # correct to gnu/linux during the next big refactor
   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'
+  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* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
   case $GCC,$cc_basename in
   yes,*)
     # gcc
     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'\''`~
+    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~
       if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
         eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
       fi'
     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}'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
       ;;
     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}'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
     ;;
 
   *,cl*)
     # Native MSVC
     libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
 
     case $build_os in
     mingw*)
       sys_lib_search_path_spec=
       lt_save_ifs=$IFS
       IFS=';'
       for lt_path in $LIB
       do
         IFS=$lt_save_ifs
         # Let DOS variable expansion print the short 8.3 style file name.
         lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
         sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
       done
       IFS=$lt_save_ifs
       # Convert to MSYS style.
       sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
       ;;
     cygwin*)
       # Convert to unix form, then to dos form, then back to unix form
       # but this time dos style (no spaces!) so that the unix form looks
       # like /cygdrive/c/PROGRA~1:/cygdr...
       sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
       sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
       sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       ;;
     *)
-      sys_lib_search_path_spec="$LIB"
+      sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
         # It is most probably a Windows format PATH.
         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
       # FIXME: find the short name or the path components, as spaces are
       # common. (e.g. "Program Files" -> "PROGRA~1")
       ;;
     esac
 
     # 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'\''`~
+    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'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $RM \$dlpath'
     shlibpath_overrides_runpath=yes
     dynamic_linker='Win32 link.exe'
     ;;
 
   *)
     # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
   esac
   # 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}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
+  library_names_spec='$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 # correct to gnu/linux during the next big refactor
   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'
+  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
   ;;
 
 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[23].*) 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}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      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 # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  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=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=no
   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   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
+    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 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/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'
+    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'
+    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'
   # or fails outright, so override atomically:
   install_override_mode=555
   ;;
 
 interix[3-9]*)
   version_type=linux # correct to gnu/linux during the next big refactor
   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'
+  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
+	if test yes = "$lt_cv_prog_gnu_ld"; then
 		version_type=linux # correct to gnu/linux during the next big refactor
 	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}'
+  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}"
+  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
   ;;
 
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # 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
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   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'
+  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
 
   # Some binutils ld are patched to set DT_RUNPATH
   if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_shlibpath_overrides_runpath=no
     save_LDFLAGS=$LDFLAGS
     save_libdir=$libdir
     eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
 	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
   lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_LDFLAGS
     libdir=$save_libdir
 
 fi
 
   shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # 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
 
-  # Append ld.so.conf contents to the search path
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) 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;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    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'
+    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'
+    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 # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  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=qnx
   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'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
-openbsd*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  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
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
   else
-    shlibpath_overrides_runpath=yes
+    need_version=yes
   fi
+  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
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  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~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
   ;;
 
 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}'
+  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"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
   dynamic_linker=no
   ;;
 
 solaris*)
   version_type=linux # correct to gnu/linux during the next big refactor
   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'
+  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'
+  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
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
   ;;
 
 sysv4 | sysv4.3*)
   version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  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
       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
+  if test -d /usr/nec; then
     version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
+    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
+  version_type=sco
   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'
+  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
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
+  if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
     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'
   ;;
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 uts4*)
   version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  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:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
 
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
 
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
+
+
+
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$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
+   test yes = "$hardcode_automatic"; then
 
   # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
+  if test no != "$hardcode_direct" &&
      # 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_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; 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:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
 
 
 
 
 
 
-  if test "x$enable_dlopen" != xyes; then
+  if test yes != "$enable_dlopen"; 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=load_add_on
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ;;
 
   mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen=LoadLibrary
     lt_cv_dlopen_libs=
     ;;
 
   cygwin*)
-    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
 
   darwin*)
-  # if libdl is installed we need to link against it
+    # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
   ac_cv_lib_dl_dlopen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
 
-    lt_cv_dlopen="dyld"
+    lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
 
 fi
 
     ;;
 
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
 if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
+  lt_cv_dlopen=shl_load
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
 if ${ac_cv_lib_dld_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
   ac_cv_lib_dld_shl_load=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
+  lt_cv_dlopen=dlopen
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
   ac_cv_lib_dl_dlopen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if ${ac_cv_lib_svld_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_svld_dlopen=yes
 else
   ac_cv_lib_svld_dlopen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
 if ${ac_cv_lib_dld_dld_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_dld_link=yes
 else
   ac_cv_lib_dld_dld_link=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+  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
+  if test no = "$lt_cv_dlopen"; then
     enable_dlopen=no
+  else
+    enable_dlopen=yes
   fi
 
   case $lt_cv_dlopen in
   dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
-    save_LDFLAGS="$LDFLAGS"
+    save_LDFLAGS=$LDFLAGS
     wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
-    save_LIBS="$LIBS"
+    save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if ${lt_cv_dlopen_self+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; 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 <<_LT_EOF
 #line $LINENO "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
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
 int fnord () { return 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;
           else puts (dlerror ());
 	}
       /* dlclose (self); */
     }
   else
     puts (dlerror ());
 
   return status;
 }
 _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  test $ac_status = 0; } && 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:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
+    if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$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 ${lt_cv_dlopen_self_static+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; 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 <<_LT_EOF
 #line $LINENO "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
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
 int fnord () { return 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;
           else puts (dlerror ());
 	}
       /* dlclose (self); */
     }
   else
     puts (dlerror ());
 
   return status;
 }
 _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  test $ac_status = 0; } && 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:${as_lineno-$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"
+    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
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 striplib=
 old_striplib=
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     fi
     ;;
   *)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     ;;
   esac
 fi
 
 
 
 
 
 
 
 
 
 
 
 
-  # Report which library types will actually be built
+  # Report what library types will actually be built
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
 $as_echo "$can_build_shared" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$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
+  test no = "$can_build_shared" && 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
+    test yes = "$enable_shared" && 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
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
 $as_echo "$enable_shared" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$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
+  test yes = "$enable_shared" || enable_static=yes
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
 
 
 
 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"
+CC=$lt_save_CC
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
         ac_config_commands="$ac_config_commands libtool"
 
 
 
 
 # Only expand once:
 
 
         # get libtool's setting of shlibpath_var
-        eval `grep "^shlibpath_var=[A-Z_]*$" $apr_builddir/libtool`
         if test "x$shlibpath_var" = "x"; then
+            eval `grep "^shlibpath_var=[A-Z_]*$" $apr_builddir/libtool`
+        fi
+        if test "x$shlibpath_var" = "x"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: SHLIBPATH variable could not be determined" >&5
+$as_echo "$as_me: SHLIBPATH variable could not be determined" >&6;}
             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-${APR_MAJOR_VERSION}"
 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) -o $@ -c $< && touch $@'
       LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
       link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(COMPILE) \$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
       so_ext='lo'
       lib_target='-rpath $(libdir) $(OBJECTS)'
       export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
 else
       lt_compile='$(COMPILE) -o $@ -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"
         ;;
     *-mingw* | *-cygwin*)
         LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
         ;;
     *)
         ;;
 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
     test "x$silent" != "xyes" && echo "  nulling CFLAGS"
     CFLAGS=""
   else
     apr_new_bugger=""
     apr_removed=0
     for i in $CFLAGS; do
       if test "x$i" != "x-g"; then
         apr_new_bugger="$apr_new_bugger $i"
       else
         apr_removed=1
       fi
     done
     if test $apr_removed = "1"; then
       test "x$silent" != "xyes" && echo "  removed \"-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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
    if test "$GCC" = "yes"; then
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
    elif test "$AIX_XLC" = "yes"; then
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
    if test "$GCC" = "yes"; then
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
+      case `($CC --version) 2>/dev/null` in
+        *clang-900* | *"clang version 5.0.0"*)
+
+  if test "x$CFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CFLAGS to \"-Wno-error=strict-prototypes\""
+    CFLAGS="-Wno-error=strict-prototypes"
+  else
+    apr_addto_bugger="-Wno-error=strict-prototypes"
+    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
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
+        CFLAGS="$CFLAGS $i"
+      fi
+    done
+  fi
+
+          ;;
+      esac
    elif test "$AIX_XLC" = "yes"; then
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x-g"; then
     test "x$silent" != "xyes" && echo "  nulling CFLAGS"
     CFLAGS=""
   else
     apr_new_bugger=""
     apr_removed=0
     for i in $CFLAGS; do
       if test "x$i" != "x-g"; then
         apr_new_bugger="$apr_new_bugger $i"
       else
         apr_removed=1
       fi
     done
     if test $apr_removed = "1"; then
       test "x$silent" != "xyes" && echo "  removed \"-g\" from CFLAGS"
       CFLAGS=$apr_new_bugger
     fi
   fi
 
     if test "$host" = "i586-pc-beos"; then
 
   if test "x$CFLAGS" = "x-O2"; then
     test "x$silent" != "xyes" && echo "  nulling CFLAGS"
     CFLAGS=""
   else
     apr_new_bugger=""
     apr_removed=0
     for i in $CFLAGS; do
       if test "x$i" != "x-O2"; then
         apr_new_bugger="$apr_new_bugger $i"
       else
         apr_removed=1
       fi
     done
     if test $apr_removed = "1"; then
       test "x$silent" != "xyes" && echo "  removed \"-O2\" from CFLAGS"
       CFLAGS=$apr_new_bugger
     fi
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CFLAGS to \"-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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$LDFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
     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
     test "x$silent" != "xyes" && echo "  nulling CFLAGS"
     CFLAGS=""
   else
     apr_new_bugger=""
     apr_removed=0
     for i in $CFLAGS; do
       if test "x$i" != "x-O2"; then
         apr_new_bugger="$apr_new_bugger $i"
       else
         apr_removed=1
       fi
     done
     if test $apr_removed = "1"; then
       test "x$silent" != "xyes" && echo "  removed \"-O2\" from CFLAGS"
       CFLAGS=$apr_new_bugger
     fi
   fi
 
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
 	    fi
 	    ;;
         esac
 	;;
     powerpc-*-beos:mwcc* )
 
   test "x$silent" != "xyes" && echo "  forcing CPP to \"mwcc -E\""
   CPP="mwcc -E"
 
 
   test "x$silent" != "xyes" && echo "  forcing CC to \"mwcc\""
   CC="mwcc"
 
 
   test "x$silent" != "xyes" && echo "  forcing AR to \"ar\""
   AR="ar"
 
 	;;
                         *-mingw* | *-cygwin*)
         if test "$enable_shared" = "yes"; then
 
   if test "x$INTERNAL_CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting INTERNAL_CPPFLAGS to \"-DAPR_DECLARE_EXPORT\""
     INTERNAL_CPPFLAGS="-DAPR_DECLARE_EXPORT"
   else
     apr_addto_bugger="-DAPR_DECLARE_EXPORT"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $INTERNAL_CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to INTERNAL_CPPFLAGS"
         INTERNAL_CPPFLAGS="$INTERNAL_CPPFLAGS $i"
       fi
     done
   fi
 
         else
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-DAPR_DECLARE_STATIC\""
     CPPFLAGS="-DAPR_DECLARE_STATIC"
   else
     apr_addto_bugger="-DAPR_DECLARE_STATIC"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
         fi
         ;;
 esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler provides atomic builtins" >&5
 $as_echo_n "checking whether the compiler provides atomic builtins... " >&6; }
 if ${ap_cv_atomic_builtins+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   ap_cv_atomic_builtins=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main()
 {
     unsigned long val = 1010, tmp, *mem = &val;
 
     if (__sync_fetch_and_add(&val, 1010) != 1010 || val != 2020)
         return 1;
 
     tmp = val;
 
     if (__sync_fetch_and_sub(mem, 1010) != tmp || val != 1010)
         return 1;
 
     if (__sync_sub_and_fetch(&val, 1010) != 0 || val != 0)
         return 1;
 
     tmp = 3030;
 
     if (__sync_val_compare_and_swap(mem, 0, tmp) != 0 || val != tmp)
         return 1;
 
     if (__sync_lock_test_and_set(&val, 4040) != 3030)
         return 1;
 
     mem = &tmp;
 
     if (__sync_val_compare_and_swap(&mem, &tmp, &val) != &tmp)
         return 1;
 
     __sync_synchronize();
 
     if (mem != &val)
         return 1;
 
     return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ap_cv_atomic_builtins=yes
 else
   ap_cv_atomic_builtins=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_atomic_builtins" >&5
 $as_echo "$ap_cv_atomic_builtins" >&6; }
 
 if test "$ap_cv_atomic_builtins" = "yes"; then
 
 $as_echo "#define HAVE_ATOMIC_BUILTINS 1" >>confdefs.h
 
 fi
 
 case $host in
     powerpc-405-*)
         # The IBM ppc405cr processor has a bugged stwcx instruction.
 
 $as_echo "#define PPC405_ERRATA 1" >>confdefs.h
 
         ;;
     *)
         ;;
 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:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
       break;
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   done
   rm -f conftest.c
 fi
 
 
 
 
 proc_mutex_is_global=0
 
 config_subdirs="none"
 INSTALL_SUBDIRS="none"
 OBJECTS_PLATFORM='$(OBJECTS_unix)'
 
 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
        eolstr="\\n"
        OBJECTS_PLATFORM='$(OBJECTS_aix)'
        ;;
    *-os2*)
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
         CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for random in -lbsd" >&5
 $as_echo_n "checking for random in -lbsd... " >&6; }
 if ${ac_cv_lib_bsd_random+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bsd_random=yes
 else
   ac_cv_lib_bsd_random=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_random" >&5
 $as_echo "$ac_cv_lib_bsd_random" >&6; }
 if test "x$ac_cv_lib_bsd_random" = xyes; 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
        OBJECTS_PLATFORM='$(OBJECTS_os2)'
        ;;
    *beos*)
        OSDIR="beos"
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
        enable_threads="system_threads"
        native_mmap_emul="1"
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BONE_VERSION in sys/socket.h" >&5
 $as_echo_n "checking for BONE_VERSION in sys/socket.h... " >&6; }
 if ${ac_cv_define_BONE_VERSION+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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
 
 $as_echo "#define HAVE_BONE_VERSION 1" >>confdefs.h
 
   fi
 
        eolstr="\\n"
        osver=`uname -r`
        proc_mutex_is_global=1
        OBJECTS_PLATFORM='$(OBJECTS_beos)'
        case $osver in
           5.0.4)
              file_as_socket="1"
              ;;
           *)
              file_as_socket="0"
              ;;
        esac
        ;;
+   *apple-darwin*)
+       ac_cv_func_fdatasync="no" # Mac OS X wrongly reports it has fdatasync()
+       OSDIR="unix"
+       eolstr="\\n"
+       ;;
    *os390)
        OSDIR="os390"
        OBJECTS_PLATFORM='$(OBJECTS_os390)'
        eolstr="\\n"
        ;;
    *os400)
        OSDIR="as400"
        eolstr="\\n"
        ;;
    *mingw*)
        OSDIR="win32"
        enable_threads="system_threads"
        eolstr="\\r\\n"
        file_as_socket=0
        proc_mutex_is_global=1
        OBJECTS_PLATFORM='$(OBJECTS_win32)'
        ;;
    *cygwin*)
        OSDIR="unix"
        enable_threads="no"
        eolstr="\\n"
        ;;
    *hpux10* )
        enable_threads="no"
        OSDIR="unix"
        eolstr="\\n"
        ;;
+   *darwin* )
+       ac_cv_func_fdatasync="no" # Mac OS X wrongly reports it has fdatasync()
+       OSDIR="unix"
+       eolstr="\\n"
+       ;;
    *)
        OSDIR="unix"
        eolstr="\\n"
        ;;
 esac
 
 
 
 # Check whether LFS has explicitly been disabled
 # Check whether --enable-lfs was given.
 if test "${enable_lfs+set}" = set; then :
   enableval=$enable_lfs; apr_lfs_choice=$enableval
 else
   apr_lfs_choice=yes
 fi
 
 
 if test "$apr_lfs_choice" = "yes"; then
    # Check whether the transitional LFS API is sufficient
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable -D_LARGEFILE64_SOURCE" >&5
 $as_echo_n "checking whether to enable -D_LARGEFILE64_SOURCE... " >&6; }
 if ${apr_cv_use_lfs64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
    apr_save_CPPFLAGS=$CPPFLAGS
    CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
    if test "$cross_compiling" = yes; then :
   apr_cv_use_lfs64=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 
 void main(void)
 {
     int fd, ret = 0;
     struct stat64 st;
     off64_t off = 4242;
 
     if (sizeof(off64_t) != 8 || sizeof(off_t) != 4)
        exit(1);
     if ((fd = open("conftest.lfs", O_LARGEFILE|O_CREAT|O_WRONLY, 0644)) < 0)
        exit(2);
     if (ftruncate64(fd, off) != 0)
        ret = 3;
     else if (fstat64(fd, &st) != 0 || st.st_size != off)
        ret = 4;
     else if (lseek64(fd, off, SEEK_SET) != off)
        ret = 5;
     else if (close(fd) != 0)
        ret = 6;
     else if (lstat64("conftest.lfs", &st) != 0 || st.st_size != off)
        ret = 7;
     else if (stat64("conftest.lfs", &st) != 0 || st.st_size != off)
        ret = 8;
     unlink("conftest.lfs");
 
     exit(ret);
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_use_lfs64=yes
 else
   apr_cv_use_lfs64=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
    CPPFLAGS=$apr_save_CPPFLAGS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_use_lfs64" >&5
 $as_echo "$apr_cv_use_lfs64" >&6; }
    if test "$apr_cv_use_lfs64" = "yes"; then
 
   if test "x$CPPFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-D_LARGEFILE64_SOURCE\""
     CPPFLAGS="-D_LARGEFILE64_SOURCE"
   else
     apr_addto_bugger="-D_LARGEFILE64_SOURCE"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
    fi
 fi
 
 # Check whether --enable-nonportable-atomics was given.
 if test "${enable_nonportable_atomics+set}" = set; then :
   enableval=$enable_nonportable_atomics; if test $enableval = yes; then
    force_generic_atomics=no
  else
    force_generic_atomics=yes
  fi
 
 else
   case $host_cpu in
    i[456]86) force_generic_atomics=yes ;;
    *) force_generic_atomics=no
       case $host in
          *solaris2.10*)
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <atomic.h>
 int
 main ()
 {
 void *ptr = NULL; atomic_cas_ptr(&ptr, NULL, NULL);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 else
   force_generic_atomics=yes
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
             if test $force_generic_atomics = yes; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: nonportable atomic support disabled, system needs Patch-ID 118884 or 118885" >&5
 $as_echo "$as_me: nonportable atomic support disabled, system needs Patch-ID 118884 or 118885" >&6;}
             fi
             ;;
       esac
       ;;
 esac
 
 fi
 
 
 if test $force_generic_atomics = yes; then
 
 $as_echo "#define USE_ATOMICS_GENERIC 1" >>confdefs.h
 
 fi
 
 
 
 
 
 # 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_major=`uname -r | sed -e 's/\([1-9][0-9]*\)\..*/\1/'`
         os_minor=`uname -r | sed -e 's/[1-9][0-9]*\.\([0-9]\+\)\..*/\1/'`
         if test $os_major -lt 2 -o \( $os_major -eq 2 -a $os_minor -lt 4 \); then
             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Configured for pre-2.4 Linux $os_major.$os_minor" >&5
 $as_echo "$as_me: WARNING: Configured for pre-2.4 Linux $os_major.$os_minor" >&2;}
             os_pre24linux=1
         else
             os_pre24linux=0
             { $as_echo "$as_me:${as_lineno-$LINENO}: Configured for Linux $os_major.$os_minor" >&5
 $as_echo "$as_me: Configured for Linux $os_major.$os_minor" >&6;}
         fi
         ;;
     *os390)
         os_version=`uname -r | sed -e 's/\.//g'`
         ;;
     *)
         os_version=OS_VERSION_IS_NOT_SET
         ;;
 esac
 
 echo "${nl}Checking for libraries..."
 
 case $host in
    *mingw*)
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting LIBS to \"-lshell32 -ladvapi32 -lws2_32 -lrpcrt4 -lmswsock\""
     LIBS="-lshell32 -ladvapi32 -lws2_32 -lrpcrt4 -lmswsock"
   else
     apr_addto_bugger="-lshell32 -ladvapi32 -lws2_32 -lrpcrt4 -lmswsock"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $LIBS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
       ac_cv_func_CreateFileMapping=yes
       ;;
    *)
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
 $as_echo_n "checking for library containing gethostbyname... " >&6; }
 if ${ac_cv_search_gethostbyname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_gethostbyname=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_gethostbyname+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_gethostbyname+:} false; then :
 
 else
   ac_cv_search_gethostbyname=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
 $as_echo "$ac_cv_search_gethostbyname" >&6; }
 ac_res=$ac_cv_search_gethostbyname
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostname" >&5
 $as_echo_n "checking for library containing gethostname... " >&6; }
 if ${ac_cv_search_gethostname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_gethostname=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_gethostname+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_gethostname+:} false; then :
 
 else
   ac_cv_search_gethostname=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for library containing socket" >&5
 $as_echo_n "checking for library containing socket... " >&6; }
 if ${ac_cv_search_socket+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 for ac_lib in '' socket; 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_socket=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_socket+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_socket+:} false; then :
 
 else
   ac_cv_search_socket=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
 $as_echo "$ac_cv_search_socket" >&6; }
 ac_res=$ac_cv_search_socket
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
 $as_echo_n "checking for library containing crypt... " >&6; }
 if ${ac_cv_search_crypt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_crypt=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_crypt+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_crypt+:} false; then :
 
 else
   ac_cv_search_crypt=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for main in -ltruerand" >&5
 $as_echo_n "checking for main in -ltruerand... " >&6; }
 if ${ac_cv_lib_truerand_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltruerand  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
 return main ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_truerand_main=yes
 else
   ac_cv_lib_truerand_main=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_truerand_main" >&5
 $as_echo "$ac_cv_lib_truerand_main" >&6; }
 if test "x$ac_cv_lib_truerand_main" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBTRUERAND 1
 _ACEOF
 
   LIBS="-ltruerand $LIBS"
 
 fi
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing modf" >&5
 $as_echo_n "checking for library containing modf... " >&6; }
 if ${ac_cv_search_modf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_modf=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_modf+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_modf+:} false; then :
 
 else
   ac_cv_search_modf=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_modf" >&5
 $as_echo "$ac_cv_search_modf" >&6; }
 ac_res=$ac_cv_search_modf
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
        ;;
 esac
 
 echo "${nl}Checking for Threads..."
 
 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 :
   ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_H 1
 _ACEOF
    enable_threads="pthread"
 else
     enable_threads="no"
 fi
 
 done
 
     CPPFLAGS="$SAVE_FL"
   else
     for ac_header in pthread.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_H 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:${as_lineno-$LINENO}: checking for CFLAGS needed for pthreads" >&5
 $as_echo_n "checking for CFLAGS needed for pthreads... " >&6; }
 if ${apr_cv_pthreads_cflags+:} false; 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
   apr_p_t_r=yes
 else
   apr_p_t_r=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam 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:${as_lineno-$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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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:${as_lineno-$LINENO}: checking for LIBS needed for pthreads" >&5
 $as_echo_n "checking for LIBS needed for pthreads... " >&6; }
 if ${apr_cv_pthreads_lib+:} false; 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
   apr_p_t_r=yes
 else
   apr_p_t_r=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam 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:${as_lineno-$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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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 :
   ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_H 1
 _ACEOF
 
           threads="1"
           pthreadh="1"
           pthreadser="1"
 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 :
   ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_H 1
 _ACEOF
 
           threads="1"
           pthreadh="1"
           pthreadser="1"
 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:${as_lineno-$LINENO}: checking for CFLAGS needed for pthreads" >&5
 $as_echo_n "checking for CFLAGS needed for pthreads... " >&6; }
 if ${apr_cv_pthreads_cflags+:} false; 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
   apr_p_t_r=yes
 else
   apr_p_t_r=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam 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:${as_lineno-$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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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:${as_lineno-$LINENO}: checking for LIBS needed for pthreads" >&5
 $as_echo_n "checking for LIBS needed for pthreads... " >&6; }
 if ${apr_cv_pthreads_lib+:} false; 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
   apr_p_t_r=yes
 else
   apr_p_t_r=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam 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:${as_lineno-$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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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 :
   ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_H 1
 _ACEOF
 
           threads="1"
           pthreadh="1"
           pthreadser="1"
 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 :
   ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_H 1
 _ACEOF
 
           threads="1"
           pthreadh="1"
           pthreadser="1"
 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:${as_lineno-$LINENO}: checking whether pthread_getspecific takes two arguments" >&5
 $as_echo_n "checking whether pthread_getspecific takes two arguments... " >&6; }
 if ${ac_cv_pthread_getspecific_two_args+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <pthread.h>
 
 int
 main ()
 {
 
 pthread_key_t key;
 void *tmp;
 pthread_getspecific(key,&tmp);
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
     ac_cv_pthread_getspecific_two_args=yes
 
 else
 
     ac_cv_pthread_getspecific_two_args=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS 1" >>confdefs.h
 
 fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_attr_getdetachstate takes one argument" >&5
 $as_echo_n "checking whether pthread_attr_getdetachstate takes one argument... " >&6; }
 if ${ac_cv_pthread_attr_getdetachstate_one_arg+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <pthread.h>
 
 int
 main ()
 {
 
 pthread_attr_t *attr;
 pthread_attr_getdetachstate(attr);
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
     ac_cv_pthread_attr_getdetachstate_one_arg=yes
 
 else
 
     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:${as_lineno-$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
 
 $as_echo "#define PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG 1" >>confdefs.h
 
 fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recursive mutex support" >&5
 $as_echo_n "checking for recursive mutex support... " >&6; }
 if ${apr_cv_mutex_recursive+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_mutex_recursive=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_mutex_recursive=yes
 else
   apr_cv_mutex_recursive=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_mutex_recursive" >&5
 $as_echo "$apr_cv_mutex_recursive" >&6; }
 
 if test "$apr_cv_mutex_recursive" = "yes"; then
 
 $as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
 
 fi
 
         for ac_func in pthread_key_delete pthread_rwlock_init \
                         pthread_attr_setguardsize pthread_yield
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = 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:${as_lineno-$LINENO}: checking for pthread_rwlock_t" >&5
 $as_echo_n "checking for pthread_rwlock_t... " >&6; }
 if ${apr_cv_type_rwlock_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <pthread.h>
 int
 main ()
 {
 pthread_rwlock_t *rwlock;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   apr_cv_type_rwlock_t=yes
 else
   apr_cv_type_rwlock_t=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define HAVE_PTHREAD_RWLOCKS 1" >>confdefs.h
 
             fi
         fi
 
         if test "$ac_cv_func_pthread_yield" = "no"; then
                         for ac_header in sched.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default"
 if test "x$ac_cv_header_sched_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SCHED_H 1
 _ACEOF
 
 fi
 
 done
 
             for ac_func in sched_yield
 do :
   ac_fn_c_check_func "$LINENO" "sched_yield" "ac_cv_func_sched_yield"
 if test "x$ac_cv_func_sched_yield" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SCHED_YIELD 1
 _ACEOF
 
 fi
 done
 
         fi
     fi
 fi
 
-ac_cv_define_READDIR_IS_THREAD_SAFE=no
+ac_cv_define_READDIR_IS_THREAD_SAFE=yes
 ac_cv_define_GETHOSTBYNAME_IS_THREAD_SAFE=no
 ac_cv_define_GETHOSTBYADDR_IS_THREAD_SAFE=no
 ac_cv_define_GETSERVBYNAME_IS_THREAD_SAFE=no
 if test "$threads" = "1"; then
     echo "APR will use threads"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readdir in -lc_r" >&5
-$as_echo_n "checking for readdir in -lc_r... " >&6; }
-if ${ac_cv_lib_c_r_readdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* 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
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_c_r_readdir=yes
-else
-  ac_cv_lib_c_r_readdir=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$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" = xyes; then :
-
 $as_echo "#define READDIR_IS_THREAD_SAFE 1" >>confdefs.h
 
-fi
-
     if test "x$apr_gethostbyname_is_thread_safe" = "x"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lc_r" >&5
 $as_echo_n "checking for gethostbyname in -lc_r... " >&6; }
 if ${ac_cv_lib_c_r_gethostbyname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_r_gethostbyname=yes
 else
   ac_cv_lib_c_r_gethostbyname=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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" = xyes; then :
   apr_gethostbyname_is_thread_safe=yes
 fi
 
     fi
     if test "$apr_gethostbyname_is_thread_safe" = "yes"; then
 
 $as_echo "#define GETHOSTBYNAME_IS_THREAD_SAFE 1" >>confdefs.h
 
     fi
     if test "x$apr_gethostbyaddr_is_thread_safe" = "x"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lc_r" >&5
 $as_echo_n "checking for gethostbyaddr in -lc_r... " >&6; }
 if ${ac_cv_lib_c_r_gethostbyaddr+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_r_gethostbyaddr=yes
 else
   ac_cv_lib_c_r_gethostbyaddr=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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" = xyes; then :
   apr_gethostbyaddr_is_thread_safe=yes
 fi
 
     fi
     if test "$apr_gethostbyaddr_is_thread_safe" = "yes"; then
 
 $as_echo "#define GETHOSTBYADDR_IS_THREAD_SAFE 1" >>confdefs.h
 
     fi
     if test "x$apr_getservbyname_is_thread_safe" = "x"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getservbyname in -lc_r" >&5
 $as_echo_n "checking for getservbyname in -lc_r... " >&6; }
 if ${ac_cv_lib_c_r_getservbyname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 getservbyname ();
 int
 main ()
 {
 return getservbyname ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_r_getservbyname=yes
 else
   ac_cv_lib_c_r_getservbyname=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_getservbyname" >&5
 $as_echo "$ac_cv_lib_c_r_getservbyname" >&6; }
 if test "x$ac_cv_lib_c_r_getservbyname" = xyes; then :
   apr_getservbyname_is_thread_safe=yes
 fi
 
     fi
     if test "$apr_getservbyname_is_thread_safe" = "yes"; then
 
 $as_echo "#define GETSERVBYNAME_IS_THREAD_SAFE 1" >>confdefs.h
 
     fi
     for ac_func in gethostbyname_r gethostbyaddr_r getservbyname_r
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = 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
 
 
 # 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && 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
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
         LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
       fi
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -lefence" >&5
 $as_echo_n "checking for malloc in -lefence... " >&6; }
 if ${ac_cv_lib_efence_malloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lefence  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_efence_malloc=yes
 else
   ac_cv_lib_efence_malloc=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_efence_malloc" >&5
 $as_echo "$ac_cv_lib_efence_malloc" >&6; }
 if test "x$ac_cv_lib_efence_malloc" = xyes; then :
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 else
    as_fn_error $? "Electric Fence requested but not detected" "$LINENO" 5
 fi
 
 
 fi
 
 
+
+# Check whether --with-valgrind was given.
+if test "${with_valgrind+set}" = set; then :
+  withval=$with_valgrind;  if test "$withval" != no; then
+      if test "$withval" = yes; then
+        withval=/usr/include/valgrind
+      fi
+
+  if test "x$CPPFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-I$withval\""
+    CPPFLAGS="-I$withval"
+  else
+    apr_addto_bugger="-I$withval"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $CPPFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $i"
+      fi
+    done
+  fi
+
+      for ac_header in valgrind.h memcheck.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+      ac_rc=yes
+for ac_spec in header:valgrind.h header:memcheck.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
+    :
+
+$as_echo "#define HAVE_VALGRIND 1" >>confdefs.h
+
+else
+    :
+    as_fn_error $? "valgrind headers not found" "$LINENO" 5
+
+fi
+
+    fi
+
+fi
+
+
 for ac_func in sigsuspend
 do :
   ac_fn_c_check_func "$LINENO" "sigsuspend" "ac_cv_func_sigsuspend"
 if test "x$ac_cv_func_sigsuspend" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SIGSUSPEND 1
 _ACEOF
   have_sigsuspend="1"
 else
    have_sigsuspend="0"
 fi
 done
 
 for ac_func in sigwait
 do :
   ac_fn_c_check_func "$LINENO" "sigwait" "ac_cv_func_sigwait"
 if test "x$ac_cv_func_sigwait" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SIGWAIT 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 kqueue port_create
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
 # Check for the Linux epoll interface; epoll* may be available in libc
 # but return ENOSYS on a pre-2.6 kernel, so do a run-time check.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll support" >&5
 $as_echo_n "checking for epoll support... " >&6; }
 if ${apr_cv_epoll+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_epoll=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/epoll.h>
 #include <unistd.h>
 
 int main()
 {
     return epoll_create(5) == -1;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_epoll=yes
 else
   apr_cv_epoll=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_epoll" >&5
 $as_echo "$apr_cv_epoll" >&6; }
 
 if test "$apr_cv_epoll" = "yes"; then
 
 $as_echo "#define HAVE_EPOLL 1" >>confdefs.h
 
 fi
 
 # test for epoll_create1
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll_create1 support" >&5
 $as_echo_n "checking for epoll_create1 support... " >&6; }
 if ${apr_cv_epoll_create1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_epoll_create1=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/epoll.h>
 #include <unistd.h>
 
 int main()
 {
     return epoll_create1(0) == -1;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_epoll_create1=yes
 else
   apr_cv_epoll_create1=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_epoll_create1" >&5
 $as_echo "$apr_cv_epoll_create1" >&6; }
 
 if test "$apr_cv_epoll_create1" = "yes"; then
 
 $as_echo "#define HAVE_EPOLL_CREATE1 1" >>confdefs.h
 
 fi
 
 # test for dup3
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dup3 support" >&5
 $as_echo_n "checking for dup3 support... " >&6; }
 if ${apr_cv_dup3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_dup3=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
 
 int main()
 {
     return dup3(STDOUT_FILENO, STDERR_FILENO, 0) == -1;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_dup3=yes
 else
   apr_cv_dup3=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_dup3" >&5
 $as_echo "$apr_cv_dup3" >&6; }
 
 if test "$apr_cv_dup3" = "yes"; then
 
 $as_echo "#define HAVE_DUP3 1" >>confdefs.h
 
 fi
 
 # Test for accept4().  Create a non-blocking socket, bind it to
 # an unspecified port & address (kernel picks), and attempt to
 # call accept4() on it.  If the syscall is wired up (i.e. the
 # kernel is new enough), it should return EAGAIN.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for accept4 support" >&5
 $as_echo_n "checking for accept4 support... " >&6; }
 if ${apr_cv_accept4+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_accept4=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 
 int main(int argc, char **argv)
 {
     int fd, flags;
     struct sockaddr_in sin;
 
     if ((fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
         return 1;
     flags = fcntl(fd, F_GETFL);
     if (flags == -1 || fcntl(fd, F_SETFL, flags|O_NONBLOCK) == -1)
         return 5;
 
     memset(&sin, 0, sizeof sin);
     sin.sin_family = AF_INET;
 
     if (bind(fd, (struct sockaddr *) &sin, sizeof sin) == -1)
         return 2;
 
     if (listen(fd, 5) == -1)
         return 3;
 
     if (accept4(fd, NULL, 0, SOCK_NONBLOCK) == 0
         || errno == EAGAIN || errno == EWOULDBLOCK)
         return 0;
 
     return 4;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_accept4=yes
 else
   apr_cv_accept4=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_accept4" >&5
 $as_echo "$apr_cv_accept4" >&6; }
 
 if test "$apr_cv_accept4" = "yes"; then
 
 $as_echo "#define HAVE_ACCEPT4 1" >>confdefs.h
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOCK_CLOEXEC support" >&5
 $as_echo_n "checking for SOCK_CLOEXEC support... " >&6; }
 if ${apr_cv_sock_cloexec+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_sock_cloexec=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
 int main()
 {
     return socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0) == -1;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_sock_cloexec=yes
 else
   apr_cv_sock_cloexec=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_sock_cloexec" >&5
 $as_echo "$apr_cv_sock_cloexec" >&6; }
 
 if test "$apr_cv_sock_cloexec" = "yes"; then
 
 $as_echo "#define HAVE_SOCK_CLOEXEC 1" >>confdefs.h
 
 fi
 
 for ac_func in fdatasync
 do :
   ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
 if test "x$ac_cv_func_fdatasync" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FDATASYNC 1
 _ACEOF
 
 fi
 done
 
 
 # test for epoll_create1
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll_create1 support" >&5
 $as_echo_n "checking for epoll_create1 support... " >&6; }
 if ${apr_cv_epoll_create1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_epoll_create1=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/epoll.h>
 #include <unistd.h>
 
 int main()
 {
     return epoll_create1(0) == -1;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_epoll_create1=yes
 else
   apr_cv_epoll_create1=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_epoll_create1" >&5
 $as_echo "$apr_cv_epoll_create1" >&6; }
 
 if test "$apr_cv_epoll_create1" = "yes"; then
 
 $as_echo "#define HAVE_EPOLL_CREATE1 1" >>confdefs.h
 
 fi
 
 # Check for z/OS async i/o support.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for asio -> message queue support" >&5
 $as_echo_n "checking for asio -> message queue support... " >&6; }
 if ${apr_cv_aio_msgq+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_aio_msgq=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _AIO_OS390
 #include <aio.h>
 
 int main()
 {
     struct aiocb a;
 
     a.aio_notifytype = AIO_MSGQ;  /* use IPC message queue for notification */
 
     return aio_cancel(2, NULL) == -1;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_aio_msgq=yes
 else
   apr_cv_aio_msgq=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_aio_msgq" >&5
 $as_echo "$apr_cv_aio_msgq" >&6; }
 
 if test "$apr_cv_aio_msgq" = "yes"; then
 
 $as_echo "#define HAVE_AIO_MSGQ 1" >>confdefs.h
 
 fi
 
 # test for dup3
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dup3 support" >&5
 $as_echo_n "checking for dup3 support... " >&6; }
 if ${apr_cv_dup3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_dup3=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
 
 int main()
 {
     return dup3(STDOUT_FILENO, STDERR_FILENO, 0) == -1;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_dup3=yes
 else
   apr_cv_dup3=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_dup3" >&5
 $as_echo "$apr_cv_dup3" >&6; }
 
 if test "$apr_cv_dup3" = "yes"; then
 
 $as_echo "#define HAVE_DUP3 1" >>confdefs.h
 
 fi
 
 # test for accept4
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for accept4 support" >&5
 $as_echo_n "checking for accept4 support... " >&6; }
 if ${apr_cv_accept4+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_accept4=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <errno.h>
 
 #define A4_SOCK "./apr_accept4_test_socket"
 
 int main()
 {
     pid_t pid;
     int fd;
     struct sockaddr_un loc, rem;
     socklen_t rem_sz;
 
     if ((pid = fork())) {
         int status;
 
         unlink(A4_SOCK);
 
         if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
             goto cleanup_failure2;
 
         loc.sun_family = AF_UNIX;
         strncpy(loc.sun_path, A4_SOCK, sizeof(loc.sun_path) - 1);
 
         if (bind(fd, (struct sockaddr *) &loc,
                  sizeof(struct sockaddr_un)) == -1)
             goto cleanup_failure;
 
         if (listen(fd, 5) == -1)
             goto cleanup_failure;
 
         rem_sz = sizeof(struct sockaddr_un);
         if (accept4(fd, (struct sockaddr *) &rem, &rem_sz, 0) == -1) {
             goto cleanup_failure;
         }
         else {
             close(fd);
             waitpid(pid, &status, 0);
             unlink(A4_SOCK);
             return 0;
         }
 
 cleanup_failure:
         close(fd);
 cleanup_failure2:
         kill(pid, SIGKILL);
         waitpid(pid, &status, 0);
         unlink(A4_SOCK);
         return 1;
     }
     else {
         if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
             return 1; /* this will be bad: we'll hang */
 
         loc.sun_family = AF_UNIX;
         strncpy(loc.sun_path, A4_SOCK, sizeof(loc.sun_path) - 1);
 
         while(connect(fd, (struct sockaddr *) &loc,
                       sizeof(struct sockaddr_un)) == -1 &&
               (errno==ENOENT || errno==ECONNREFUSED))
             ;
 
         close(fd);
         return 0;
     }
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_accept4=yes
 else
   apr_cv_accept4=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_accept4" >&5
 $as_echo "$apr_cv_accept4" >&6; }
 
 if test "$apr_cv_accept4" = "yes"; then
 
 $as_echo "#define HAVE_ACCEPT4 1" >>confdefs.h
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOCK_CLOEXEC support" >&5
 $as_echo_n "checking for SOCK_CLOEXEC support... " >&6; }
 if ${apr_cv_sock_cloexec+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   apr_cv_sock_cloexec=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
 int main()
 {
     return socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0) == -1;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_sock_cloexec=yes
 else
   apr_cv_sock_cloexec=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_sock_cloexec" >&5
 $as_echo "$apr_cv_sock_cloexec" >&6; }
 
 if test "$apr_cv_sock_cloexec" = "yes"; then
 
 $as_echo "#define HAVE_SOCK_CLOEXEC 1" >>confdefs.h
 
 fi
 
 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`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = 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:${as_lineno-$LINENO}: checking for library containing shm_open" >&5
 $as_echo_n "checking for library containing shm_open... " >&6; }
 if ${ac_cv_search_shm_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_shm_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_shm_open+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_shm_open+:} false; then :
 
 else
   ac_cv_search_shm_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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/types.h sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h windows.h
+for ac_header in sys/types.h sys/mman.h sys/ipc.h sys/mutex.h \
+                  sys/shm.h sys/file.h sys/socket.h kernel/OS.h os2.h windows.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
+for ac_header in net/if.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <net/if.h>
+
+"
+if test "x$ac_cv_header_net_if_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NET_IF_H 1
+_ACEOF
+
+fi
+
+done
+
 for ac_func in mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \
-                create_area
+                create_area mprotect
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANON in sys/mman.h" >&5
 $as_echo_n "checking for MAP_ANON in sys/mman.h... " >&6; }
 if ${ac_cv_define_MAP_ANON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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
 
 $as_echo "#define HAVE_MAP_ANON 1" >>confdefs.h
 
   fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/zero" >&5
 $as_echo_n "checking for /dev/zero... " >&6; }
 if ${ac_cv_file__dev_zero+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 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:${as_lineno-$LINENO}: result: $ac_cv_file__dev_zero" >&5
 $as_echo "$ac_cv_file__dev_zero" >&6; }
 if test "x$ac_cv_file__dev_zero" = xyes; then :
 
 fi
 
 
 # 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:${as_lineno-$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
 
 else
   ac_cv_file__dev_zero=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
     { $as_echo "$as_me:${as_lineno-$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
 
 ac_rc=yes
 for ac_spec in header:windows.h func:CreateFileMapping; do
     ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
     ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
     case $ac_type in
         header )
             ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
             ac_var="ac_cv_header_$ac_item"
             ;;
         file )
             ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
             ac_var="ac_cv_file_$ac_item"
             ;;
         func )   ac_var="ac_cv_func_$ac_item"   ;;
         struct ) ac_var="ac_cv_struct_$ac_item" ;;
         define ) ac_var="ac_cv_define_$ac_item" ;;
         custom ) ac_var="$ac_item" ;;
     esac
     eval "ac_val=\$$ac_var"
     if test ".$ac_val" != .yes; then
         ac_rc=no
         break
     fi
 done
 if test ".$ac_rc" = .yes; then
     :
     havewin32shm="1"
 
 ac_decision='USE_SHMEM_WIN32_ANON'
 ac_decision_msg='Windows CreateFileMapping()'
 ac_decision_USE_SHMEM_WIN32_ANON=yes
 ac_decision_USE_SHMEM_WIN32_ANON_msg='Windows CreateFileMapping()'
 
 else
     :
 
 fi
 
 case $host in
     *linux* )
         # Linux has problems with MM_SHMT_MMANON even though it reports
         # 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_pre24linux -eq 1; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling anon mmap() support for Linux pre-2.4" >&5
 $as_echo "$as_me: WARNING: Disabling anon mmap() support for Linux pre-2.4" >&2;}
                 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:${as_lineno-$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"
 havewin32shm="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
 
 ac_rc=yes
 for ac_spec in header:windows.h; do
     ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
     ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
     case $ac_type in
         header )
             ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
             ac_var="ac_cv_header_$ac_item"
             ;;
         file )
             ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
             ac_var="ac_cv_file_$ac_item"
             ;;
         func )   ac_var="ac_cv_func_$ac_item"   ;;
         struct ) ac_var="ac_cv_struct_$ac_item" ;;
         define ) ac_var="ac_cv_define_$ac_item" ;;
         custom ) ac_var="$ac_item" ;;
     esac
     eval "ac_val=\$$ac_var"
     if test ".$ac_val" != .yes; then
         ac_rc=no
         break
     fi
 done
 if test ".$ac_rc" = .yes; then
     :
     havewin32shm="1"
 
 ac_decision='USE_SHMEM_WIN32'
 ac_decision_msg='Windows shared memory'
 ac_decision_USE_SHMEM_WIN32=yes
 ac_decision_USE_SHMEM_WIN32_msg='Windows shared memory'
 
 else
     :
 
 fi
 
 # Check whether --enable-posix-shm was given.
 if test "${enable_posix_shm+set}" = set; then :
   enableval=$enable_posix_shm;
 if test "$havemmapshm" = "1"; then
       ac_decision=''
     for ac_item in USE_SHMEM_MMAP_SHM; 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
 
 fi
 
 case $host in
     *linux* )
         # Linux pre-2.4 had problems with MM_SHMT_MMANON even though
         # it reports that it has it.
         if test $os_pre24linux -eq 1; 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:${as_lineno-$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"
 usewin32shm="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"
         ;;
     USE_SHMEM_WIN32 )
         usewin32shm="1"
         ;;
 esac
 
 # Do we have any shared memory support?
 if test "$usemmaptmp$usemmapshm$usemmapzero$useshmget$usemmapanon$usebeosarea$useos2shm$usewin32shm" = "00000000"; then
   sharedmem="0"
 else
   sharedmem="1"
 fi
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
 cat >>confdefs.h <<_ACEOF
 #define size_t unsigned int
 _ACEOF
 
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
 if ${ac_cv_working_alloca_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
 main ()
 {
 char *p = (char *) alloca (2 * sizeof (int));
 			  if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
 else
   ac_cv_working_alloca_h=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
 $as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
 $as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
 if ${ac_cv_func_alloca_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
 # ifdef _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
 # else
 #  ifdef HAVE_ALLOCA_H
 #   include <alloca.h>
 #  else
 #   ifdef _AIX
  #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca (size_t);
 #    endif
 #   endif
 #  endif
 # endif
 #endif
 
 int
 main ()
 {
 char *p = (char *) alloca (1);
 				    if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
 else
   ac_cv_func_alloca_works=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
 $as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
 $as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
 # that cause trouble.  Some versions do not even contain alloca or
 # contain a buggy version.  If you still want to use their alloca,
 # use ar to extract alloca.o from them instead of compiling alloca.c.
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
 $as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
 if ${ac_cv_os_cray+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined CRAY && ! defined CRAY2
 webecray
 #else
 wenotbecray
 #endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "webecray" >/dev/null 2>&1; then :
   ac_cv_os_cray=yes
 else
   ac_cv_os_cray=no
 fi
 rm -f conftest*
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
 $as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
 _ACEOF
 
     break
 fi
 
   done
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
 if ${ac_cv_c_stack_direction+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 find_stack_direction (int *addr, int depth)
 {
   int dir, dummy = 0;
   if (! addr)
     addr = &dummy;
   *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
   dir = depth ? find_stack_direction (addr, depth - 1) : 0;
   return dir + dummy;
 }
 
 int
 main (int argc, char **argv)
 {
   return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
 else
   ac_cv_c_stack_direction=-1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
 $as_echo "$ac_cv_c_stack_direction" >&6; }
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 _ACEOF
 
 
 fi
 
 
 for ac_func in calloc setsid isinf isnan \
                 getenv putenv setenv unsetenv \
                 writev getifaddrs utime utimes
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = 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 :
   ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
 if test "x$ac_cv_func_setrlimit" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SETRLIMIT 1
 _ACEOF
   have_setrlimit="1"
 else
    have_setrlimit="0"
 fi
 done
 
 for ac_func in getrlimit
 do :
   ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
 if test "x$ac_cv_func_getrlimit" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETRLIMIT 1
 _ACEOF
   have_getrlimit="1"
 else
    have_getrlimit="0"
 fi
 done
 
 sendfile="0"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendfilev in -lsendfile" >&5
 $as_echo_n "checking for sendfilev in -lsendfile... " >&6; }
 if ${ac_cv_lib_sendfile_sendfilev+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsendfile  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sendfile_sendfilev=yes
 else
   ac_cv_lib_sendfile_sendfilev=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sendfile_sendfilev" >&5
 $as_echo "$ac_cv_lib_sendfile_sendfilev" >&6; }
 if test "x$ac_cv_lib_sendfile_sendfilev" = xyes; 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`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   sendfile="1"
 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_pre24linux -eq 1; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabled sendfile support for Linux 2.2 on S/390" >&5
 $as_echo "$as_me: WARNING: Disabled sendfile support for Linux 2.2 on S/390" >&2;}
                 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:${as_lineno-$LINENO}: checking size of void*" >&5
 $as_echo_n "checking size of void*... " >&6; }
 if ${ac_cv_sizeof_voidp+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp"        "$ac_includes_default"; then :
 
 else
   if test "$ac_cv_type_voidp" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (void*)
 See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_voidp=0
    fi
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
             ;;
     esac
     if test "$orig_sendfile" != "$sendfile"; then
       echo "sendfile support disabled to avoid system problem"
     fi
 fi
 
 
 
 for ac_func in sigaction
 do :
   ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
 if test "x$ac_cv_func_sigaction" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SIGACTION 1
 _ACEOF
   have_sigaction="1"
 else
    have_sigaction="0"
 fi
 done
 
 ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include <signal.h>
 /* NetBSD declares sys_siglist in unistd.h.  */
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
 "
 if test "x$ac_cv_have_decl_sys_siglist" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_SYS_SIGLIST $ac_have_decl
 _ACEOF
 
 
 
 for ac_func in fork
 do :
   ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
 if test "x$ac_cv_func_fork" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FORK 1
 _ACEOF
   fork="1"
 else
    fork="0"
 fi
 done
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr" >&5
 $as_echo_n "checking for inet_addr... " >&6; }
 if ${ac_cv_func_inet_addr+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
 
     ac_cv_func_inet_addr=yes
 
 else
 
     ac_cv_func_inet_addr=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for inet_network" >&5
 $as_echo_n "checking for inet_network... " >&6; }
 if ${ac_cv_func_inet_network+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
 
     ac_cv_func_inet_network=yes
 
 else
 
     ac_cv_func_inet_network=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 
 ac_fn_c_check_func "$LINENO" "_getch" "ac_cv_func__getch"
 if test "x$ac_cv_func__getch" = xyes; then :
 
 fi
 
 for ac_func in strerror_r
 do :
   ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
 if test "x$ac_cv_func_strerror_r" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRERROR_R 1
 _ACEOF
   strerror_r="1"
 else
    strerror_r="0"
 fi
 done
 
 if test "$strerror_r" = "1"; then
 
 { $as_echo "$as_me:${as_lineno-$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_strerror_r_rc_int=yes
 else
 
     ac_cv_strerror_r_rc_int=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 if test "x$ac_cv_strerror_r_rc_int" = xyes; then
 
 $as_echo "#define STRERROR_R_RC_INT 1" >>confdefs.h
 
   msg="int"
 else
   msg="pointer"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
 $as_echo "$msg" >&6; }
 
 fi
 for ac_func in mmap
 do :
   ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
 if test "x$ac_cv_func_mmap" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MMAP 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 :
   ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
 if test "x$ac_cv_func_memmove" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MEMMOVE 1
 _ACEOF
   have_memmove="1"
 else
   have_memmove="0"
 fi
 done
 
 for ac_func in getpass getpassphrase gmtime_r localtime_r
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 case $host in
     *-hp-hpux*)
                 ;;
     *)
         for ac_func in mkstemp
 do :
   ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
 if test "x$ac_cv_func_mkstemp" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MKSTEMP 1
 _ACEOF
 
 fi
 done
 
         ;;
 esac
 
 
 
 
 
 
 
 
 
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sigwait takes one argument" >&5
 $as_echo_n "checking whether sigwait takes one argument... " >&6; }
 if ${ac_cv_sigwait_one_arg+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_sigwait_one_arg=yes
 
 else
 
   ac_cv_sigwait_one_arg=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define SIGWAIT_TAKES_ONE_ARG 1" >>confdefs.h
 
   fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
   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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
 
 else
   ac_cv_header_stdc=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 
 
 for ac_header in ByteOrder.h		\
     conio.h		\
     crypt.h		\
     ctype.h		\
     dir.h		\
     dirent.h		\
     dl.h		\
     dlfcn.h		\
     errno.h		\
     fcntl.h		\
     grp.h		\
+    inttypes.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		\
     windows.h		\
     winsock2.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/param.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`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
 for aprt_i in ByteOrder.h		\
     conio.h		\
     crypt.h		\
     ctype.h		\
     dir.h		\
     dirent.h		\
     dl.h		\
     dlfcn.h		\
     errno.h		\
     fcntl.h		\
     grp.h		\
+    inttypes.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		\
     windows.h		\
     winsock2.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/param.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:${as_lineno-$LINENO}: checking for netinet/tcp.h" >&5
 $as_echo_n "checking for netinet/tcp.h... " >&6; }
 if ${apr_cv_hdr_netinet_tcp_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 #include <netinet/tcp.h>
 
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   apr_cv_hdr_netinet_tcp_h=yes
 else
   apr_cv_hdr_netinet_tcp_h=no
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define HAVE_NETINET_TCP_H 1" >>confdefs.h
 
 else
    netinet_tcph=0
 fi
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
+
 # Checking for h_errno in <netdb.h>
 if test "$netdbh" = "1"; then
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for h_errno in netdb.h" >&5
 $as_echo_n "checking for h_errno in netdb.h... " >&6; }
   if ${ac_cv_h_errno_cppflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 
   if test x != x; then
     CPPFLAGS="-D $CPPFLAGS"
   fi
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
 
   if test x != x; then
     ac_cv_h_errno_cppflags=""
   else
     ac_cv_h_errno_cppflags=yes
   fi
 
 else
 
   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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
 
   if test x$flag != x; then
     ac_cv_h_errno_cppflags="$flag"
   else
     ac_cv_h_errno_cppflags=yes
   fi
 
 else
 
   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:${as_lineno-$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:${as_lineno-$LINENO}: result: $ac_cv_h_errno_cppflags" >&5
 $as_echo "$ac_cv_h_errno_cppflags" >&6; }
     fi
   else
     { $as_echo "$as_me:${as_lineno-$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_fn_error $? "can not find h_errno in netdb.h" "$LINENO" 5
   fi
 fi
 
 # Check whether --enable-allocator-uses-mmap was given.
 if test "${enable_allocator_uses_mmap+set}" = set; then :
   enableval=$enable_allocator_uses_mmap;  if test "$enableval" = "yes"; then
         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
     :
 
 $as_echo "#define APR_ALLOCATOR_USES_MMAP 1" >>confdefs.h
 
 else
     :
     as_fn_error $? "mmap()/MAP_ANON not supported" "$LINENO" 5
 
 fi
 
     fi
 
 fi
 
 
+# Check whether --enable-allocator-guard-pages was given.
+if test "${enable_allocator_guard_pages+set}" = set; then :
+  enableval=$enable_allocator_guard_pages;  if test "$enableval" = "yes"; then
+        ac_rc=yes
+for ac_spec in header:sys/mman.h func:mmap func:munmap func:mprotect 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
+    :
+
+$as_echo "#define APR_ALLOCATOR_GUARD_PAGES 1" >>confdefs.h
+
+else
+    :
+    as_fn_error $? "mmap()/MAP_ANON/mprotect() not supported" "$LINENO" 5
+
+fi
+
+    fi
+
+fi
+
+
+
+# Check whether --enable-pool-concurrency-check was given.
+if test "${enable_pool_concurrency_check+set}" = set; then :
+  enableval=$enable_pool_concurrency_check;  if test "$enableval" = "yes"; then
+
+$as_echo "#define APR_POOL_CONCURRENCY_CHECK 1" >>confdefs.h
+
+    fi
+
+fi
+
+
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
 if test "x$ac_cv_type_off_t" = xyes; then :
 
 else
 
 cat >>confdefs.h <<_ACEOF
 #define off_t long int
 _ACEOF
 
 fi
 
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
 if test "x$ac_cv_type_pid_t" = xyes; then :
 
 else
 
 cat >>confdefs.h <<_ACEOF
 #define pid_t int
 _ACEOF
 
 fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
 cat >>confdefs.h <<_ACEOF
 #define size_t unsigned int
 _ACEOF
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
 $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
 if ${ac_cv_type_uid_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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
 
 $as_echo "#define uid_t int" >>confdefs.h
 
 
 $as_echo "#define gid_t int" >>confdefs.h
 
 fi
 
 ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
 if test "x$ac_cv_type_ssize_t" = xyes; then :
 
 else
 
 cat >>confdefs.h <<_ACEOF
 #define ssize_t int
 _ACEOF
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
 if ${ac_cv_c_inline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_inline=$ac_kw
 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:${as_lineno-$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:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if ${ac_cv_c_const+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this sort of thing.  */
   typedef int charset[2];
   const charset cs = { 0, 0 };
   /* 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 sort of thing.  */
     char tx;
     char *t = &tx;
     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 sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
     struct s { int j; const int *ap[3]; } bx;
     struct s *b = &bx; 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
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_const=yes
 else
   ac_cv_c_const=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
 $as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 $as_echo "#define const /**/" >>confdefs.h
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setpgrp takes no argument" >&5
 $as_echo_n "checking whether setpgrp takes no argument... " >&6; }
 if ${ac_cv_func_setpgrp_void+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   as_fn_error $? "cannot check setpgrp when cross compiling" "$LINENO" 5
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_setpgrp_void=no
 else
   ac_cv_func_setpgrp_void=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define SETPGRP_VOID 1" >>confdefs.h
 
 fi
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
 $as_echo_n "checking for socklen_t... " >&6; }
 if ${ac_cv_socklen_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
 
     ac_cv_socklen_t=yes
 
 else
 
     ac_cv_socklen_t=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_socklen_t" >&5
 $as_echo "$ac_cv_socklen_t" >&6; }
 
 if test "$ac_cv_socklen_t" = "yes"; then
 
 $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h
 
 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:${as_lineno-$LINENO}: checking size of void*" >&5
 $as_echo_n "checking size of void*... " >&6; }
 if ${ac_cv_sizeof_voidp+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp"        "$ac_includes_default"; then :
 
 else
   if test "$ac_cv_type_voidp" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (void*)
 See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_voidp=0
    fi
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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_fn_error $? "Cannot determine size of void*" "$LINENO" 5
 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:${as_lineno-$LINENO}: checking size of char" >&5
 $as_echo_n "checking size of char... " >&6; }
 if ${ac_cv_sizeof_char+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
 
 else
   if test "$ac_cv_type_char" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (char)
 See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_char=0
    fi
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if ${ac_cv_sizeof_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_int" = yes; then
+  if test "$ac_cv_type_short" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int)
+as_fn_error 77 "cannot compute sizeof (short)
 See \`config.log' for more details" "$LINENO" 5; }
    else
-     ac_cv_sizeof_int=0
+     ac_cv_sizeof_short=0
    fi
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
+#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:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if ${ac_cv_sizeof_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_long" = yes; then
+  if test "$ac_cv_type_int" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
+as_fn_error 77 "cannot compute sizeof (int)
 See \`config.log' for more details" "$LINENO" 5; }
    else
-     ac_cv_sizeof_long=0
+     ac_cv_sizeof_int=0
    fi
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
+#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:${as_lineno-$LINENO}: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if ${ac_cv_sizeof_short+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
 
 else
-  if test "$ac_cv_type_short" = yes; then
+  if test "$ac_cv_type_long" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (short)
+as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
-     ac_cv_sizeof_short=0
+     ac_cv_sizeof_long=0
    fi
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
+#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:${as_lineno-$LINENO}: checking size of long long" >&5
 $as_echo_n "checking size of long long... " >&6; }
 if ${ac_cv_sizeof_long_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
 
 else
   if test "$ac_cv_type_long_long" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long_long=0
    fi
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
+# The first match is our preference (use inttypes if available).
+ac_rc=yes
+for ac_spec in header:stdint.h header:inttypes.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
+    :
+    hasinttypes="1"
+else
+    :
+    hasinttypes="0"
+fi
+
+if test "$hasinttypes" = "1"; then
+    int64_literal='#define APR_INT64_C(val) INT64_C(val)'
+    uint64_literal='#define APR_UINT64_C(val) UINT64_C(val)'
+    int64_t_fmt='#define APR_INT64_T_FMT PRId64'
+    uint64_t_fmt='#define APR_UINT64_T_FMT PRIu64'
+    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT PRIx64'
+    int64_value="int64_t"
+    uint64_value="uint64_t"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether int64_t and int use fmt %d" >&5
+$as_echo_n "checking whether int64_t and int use fmt %d... " >&6; }
+if ${apr_cv_typematch_int64_t_int_d+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "confdefs.h"
+
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+   int main(int argc, const char *const *argv) {
+
+    int64_t chk1, *ptr1;
+    int chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%d %d", chk1, chk2);
+
+      return 0; }
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_int64_t_int_d=yes
+else
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_int64_t_int_d=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_int64_t_int_d" >&5
+$as_echo "$apr_cv_typematch_int64_t_int_d" >&6; }
+if test "$apr_cv_typematch_int64_t_int_d" = "yes"; then
+    :
+
+        int64_strfn="strtoi"
+
+else
+    :
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether int64_t and long use fmt %ld" >&5
+$as_echo_n "checking whether int64_t and long use fmt %ld... " >&6; }
+if ${apr_cv_typematch_int64_t_long_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "confdefs.h"
+
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+   int main(int argc, const char *const *argv) {
+
+    int64_t chk1, *ptr1;
+    long chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%ld %ld", chk1, chk2);
+
+      return 0; }
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_int64_t_long_ld=yes
+else
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_int64_t_long_ld=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_int64_t_long_ld" >&5
+$as_echo "$apr_cv_typematch_int64_t_long_ld" >&6; }
+if test "$apr_cv_typematch_int64_t_long_ld" = "yes"; then
+    :
+
+        int64_strfn="strtol"
+
+else
+    :
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether int64_t and long long use fmt %lld" >&5
+$as_echo_n "checking whether int64_t and long long use fmt %lld... " >&6; }
+if ${apr_cv_typematch_int64_t_long_long_lld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "confdefs.h"
+
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+   int main(int argc, const char *const *argv) {
+
+    int64_t chk1, *ptr1;
+    long long chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%lld %lld", chk1, chk2);
+
+      return 0; }
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_int64_t_long_long_lld=yes
+else
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_int64_t_long_long_lld=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_int64_t_long_long_lld" >&5
+$as_echo "$apr_cv_typematch_int64_t_long_long_lld" >&6; }
+if test "$apr_cv_typematch_int64_t_long_long_lld" = "yes"; then
+    :
+
+        int64_strfn="strtoll"
+
+else
+    :
+
+        as_fn_error $? "could not determine the string function for int64_t" "$LINENO" 5
+
+fi
+
+fi
+
+fi
+
+elif test "$ac_cv_sizeof_int" = "8"; then
     int64_literal='#define APR_INT64_C(val) (val)'
     uint64_literal='#define APR_UINT64_C(val) (val##U)'
     int64_t_fmt='#define APR_INT64_T_FMT "d"'
     uint64_t_fmt='#define APR_UINT64_T_FMT "u"'
     uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "x"'
     int64_value="int"
-    long_value=int
+    uint64_value="unsigned int"
     int64_strfn="strtoi"
 elif test "$ac_cv_sizeof_long" = "8"; then
     int64_literal='#define APR_INT64_C(val) (val##L)'
     uint64_literal='#define APR_UINT64_C(val) (val##UL)'
     int64_t_fmt='#define APR_INT64_T_FMT "ld"'
     uint64_t_fmt='#define APR_UINT64_T_FMT "lu"'
     uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "lx"'
     int64_value="long"
-    long_value=long
+    uint64_value="unsigned long"
     int64_strfn="strtol"
 elif test "$ac_cv_sizeof_long_long" = "8"; then
     int64_literal='#define APR_INT64_C(val) (val##LL)'
     uint64_literal='#define APR_UINT64_C(val) (val##ULL)'
     # 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"'
     uint64_t_fmt='#define APR_UINT64_T_FMT "llu"'
     uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "llx"'
     int64_value="long long"
-    long_value="long long"
+    uint64_value="unsigned long long"
     int64_strfn="strtoll"
 elif test "$ac_cv_sizeof_longlong" = "8"; then
     int64_literal='#define APR_INT64_C(val) (val##LL)'
     uint64_literal='#define APR_UINT64_C(val) (val##ULL)'
     int64_t_fmt='#define APR_INT64_T_FMT "qd"'
     uint64_t_fmt='#define APR_UINT64_T_FMT "qu"'
     uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "qx"'
     int64_value="__int64"
-    long_value="__int64"
+    uint64_value="unsigned __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.
     as_fn_error $? "could not detect a 64-bit integer type" "$LINENO" 5
 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:${as_lineno-$LINENO}: checking for INT64_C" >&5
 $as_echo_n "checking for INT64_C... " >&6; }
 if ${apr_cv_define_INT64_C+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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)'
     uint64_literal='#define APR_UINT64_C(val) UINT64_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:${as_lineno-$LINENO}: checking size of pid_t" >&5
 $as_echo_n "checking size of pid_t... " >&6; }
 if ${ac_cv_sizeof_pid_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   ac_cv_sizeof_pid_t=8
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <sys/types.h>
 #ifdef WIN32
 #define binmode "b"
 #else
 #define binmode
 #endif
 main()
 {
   FILE *f=fopen("conftestval", "w" binmode);
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(pid_t));
   exit(0);
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_sizeof_pid_t=`cat conftestval`
 else
   ac_cv_sizeof_pid_t=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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.
 case $host in
    s390*linux*)
        # uniquely, the 31-bit Linux/s390 uses "unsigned long int"
        # for size_t rather than "unsigned int":
        size_t_fmt="lu"
        ssize_t_fmt="ld"
        ;;
    *-os2*)
        size_t_fmt="lu"
        ;;
    *-solaris*)
        if test "$ac_cv_sizeof_long" = "8"; then
          pid_t_fmt='#define APR_PID_T_FMT "d"'
        else
          pid_t_fmt='#define APR_PID_T_FMT "ld"'
        fi
        ;;
    *aix4*|*aix5*)
        ssize_t_fmt="ld"
        size_t_fmt="lu"
        ;;
     *beos*)
         ssize_t_fmt="ld"
         size_t_fmt="ld"
         ;;
     *apple-darwin*)
         osver=`uname -r`
         case $osver in
            [0-7].*)
               ssize_t_fmt="d"
               ;;
            *)
               ssize_t_fmt="ld"
               ;;
         esac
         size_t_fmt="lu"
         ;;
     *-mingw*)
         int64_t_fmt='#define APR_INT64_T_FMT "I64d"'
         uint64_t_fmt='#define APR_UINT64_T_FMT "I64u"'
         uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "I64x"'
         int64_value="__int64"
-        long_value="__int64"
+        uint64_value="unsigned __int64"
         int64_strfn="_strtoi64"
         ;;
 esac
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ssize_t and int are the same" >&5
-$as_echo_n "checking whether ssize_t and int are the same... " >&6; }
-if ${apr_cv_typematch_ssize_t_int+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ssize_t and long use fmt %ld" >&5
+$as_echo_n "checking whether ssize_t and long use fmt %ld... " >&6; }
+if ${apr_cv_typematch_ssize_t_long_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
+#include "confdefs.h"
 
-    int foo[0 - !__builtin_types_compatible_p(ssize_t, int)];
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
-  ;
-  return 0;
-}
+   int main(int argc, const char *const *argv) {
+
+    ssize_t chk1, *ptr1;
+    long chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%ld %ld", chk1, chk2);
+
+      return 0; }
+
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  apr_cv_typematch_ssize_t_int=yes
-ssize_t_fmt="d"
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_ssize_t_long_ld=yes
 else
-  apr_cv_typematch_ssize_t_int=no
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_ssize_t_long_ld=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_ssize_t_int" >&5
-$as_echo "$apr_cv_typematch_ssize_t_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_ssize_t_long_ld" >&5
+$as_echo "$apr_cv_typematch_ssize_t_long_ld" >&6; }
+if test "$apr_cv_typematch_ssize_t_long_ld" = "yes"; then
+    :
+    ssize_t_fmt="ld"
+else
+    :
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ssize_t and long are the same" >&5
-$as_echo_n "checking whether ssize_t and long are the same... " >&6; }
-if ${apr_cv_typematch_ssize_t_long+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ssize_t and int use fmt %d" >&5
+$as_echo_n "checking whether ssize_t and int use fmt %d... " >&6; }
+if ${apr_cv_typematch_ssize_t_int_d+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
+#include "confdefs.h"
 
-    int foo[0 - !__builtin_types_compatible_p(ssize_t, long)];
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
-  ;
-  return 0;
-}
+   int main(int argc, const char *const *argv) {
+
+    ssize_t chk1, *ptr1;
+    int chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%d %d", chk1, chk2);
+
+      return 0; }
+
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  apr_cv_typematch_ssize_t_long=yes
-ssize_t_fmt="ld"
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_ssize_t_int_d=yes
 else
-  apr_cv_typematch_ssize_t_long=no
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_ssize_t_int_d=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_ssize_t_long" >&5
-$as_echo "$apr_cv_typematch_ssize_t_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_ssize_t_int_d" >&5
+$as_echo "$apr_cv_typematch_ssize_t_int_d" >&6; }
+if test "$apr_cv_typematch_ssize_t_int_d" = "yes"; then
+    :
+    ssize_t_fmt="d"
+else
+    :
 
+fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether size_t and unsigned int are the same" >&5
-$as_echo_n "checking whether size_t and unsigned int are the same... " >&6; }
-if ${apr_cv_typematch_size_t_unsigned_int+:} false; then :
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether size_t and unsigned long use fmt %lu" >&5
+$as_echo_n "checking whether size_t and unsigned long use fmt %lu... " >&6; }
+if ${apr_cv_typematch_size_t_unsigned_long_lu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
+#include "confdefs.h"
 
-    int foo[0 - !__builtin_types_compatible_p(size_t, unsigned int)];
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
-  ;
-  return 0;
-}
+   int main(int argc, const char *const *argv) {
+
+    size_t chk1, *ptr1;
+    unsigned long chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%lu %lu", chk1, chk2);
+
+      return 0; }
+
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  apr_cv_typematch_size_t_unsigned_int=yes
-size_t_fmt="u"
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_size_t_unsigned_long_lu=yes
 else
-  apr_cv_typematch_size_t_unsigned_int=no
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_size_t_unsigned_long_lu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_size_t_unsigned_int" >&5
-$as_echo "$apr_cv_typematch_size_t_unsigned_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_size_t_unsigned_long_lu" >&5
+$as_echo "$apr_cv_typematch_size_t_unsigned_long_lu" >&6; }
+if test "$apr_cv_typematch_size_t_unsigned_long_lu" = "yes"; then
+    :
+    size_t_fmt="lu"
+else
+    :
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether size_t and unsigned long are the same" >&5
-$as_echo_n "checking whether size_t and unsigned long are the same... " >&6; }
-if ${apr_cv_typematch_size_t_unsigned_long+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether size_t and unsigned int use fmt %u" >&5
+$as_echo_n "checking whether size_t and unsigned int use fmt %u... " >&6; }
+if ${apr_cv_typematch_size_t_unsigned_int_u+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
+#include "confdefs.h"
 
-    int foo[0 - !__builtin_types_compatible_p(size_t, unsigned long)];
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
-  ;
-  return 0;
-}
+   int main(int argc, const char *const *argv) {
+
+    size_t chk1, *ptr1;
+    unsigned int chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%u %u", chk1, chk2);
+
+      return 0; }
+
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  apr_cv_typematch_size_t_unsigned_long=yes
-size_t_fmt="lu"
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_size_t_unsigned_int_u=yes
 else
-  apr_cv_typematch_size_t_unsigned_long=no
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_size_t_unsigned_int_u=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_size_t_unsigned_long" >&5
-$as_echo "$apr_cv_typematch_size_t_unsigned_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_size_t_unsigned_int_u" >&5
+$as_echo "$apr_cv_typematch_size_t_unsigned_int_u" >&6; }
+if test "$apr_cv_typematch_size_t_unsigned_int_u" = "yes"; then
+    :
+    size_t_fmt="u"
+else
+    :
 
+fi
 
+
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
 $as_echo_n "checking size of ssize_t... " >&6; }
 if ${ac_cv_sizeof_ssize_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   ac_cv_sizeof_ssize_t=8
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <sys/types.h>
 #ifdef WIN32
 #define binmode "b"
 #else
 #define binmode
 #endif
 main()
 {
   FILE *f=fopen("conftestval", "w" binmode);
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(ssize_t));
   exit(0);
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_sizeof_ssize_t=`cat conftestval`
 else
   ac_cv_sizeof_ssize_t=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which format to use for apr_ssize_t" >&5
 $as_echo_n "checking which format to use for apr_ssize_t... " >&6; }
 if test -n "$ssize_t_fmt"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: %$ssize_t_fmt" >&5
 $as_echo "%$ssize_t_fmt" >&6; }
 elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
     ssize_t_fmt="d"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: %d" >&5
 $as_echo "%d" >&6; }
 elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long"; then
     ssize_t_fmt="ld"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5
 $as_echo "%ld" >&6; }
 else
     as_fn_error $? "could not determine the proper format for apr_ssize_t" "$LINENO" 5
 fi
 
 ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
 $as_echo_n "checking size of size_t... " >&6; }
 if ${ac_cv_sizeof_size_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   ac_cv_sizeof_size_t=8
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <stddef.h>
 #ifdef WIN32
 #define binmode "b"
 #else
 #define binmode
 #endif
 main()
 {
   FILE *f=fopen("conftestval", "w" binmode);
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(size_t));
   exit(0);
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_sizeof_size_t=`cat conftestval`
 else
   ac_cv_sizeof_size_t=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 
 
+# else cases below should no longer occur;
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which format to use for apr_size_t" >&5
 $as_echo_n "checking which format to use for apr_size_t... " >&6; }
 if test -n "$size_t_fmt"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: %$size_t_fmt" >&5
 $as_echo "%$size_t_fmt" >&6; }
 elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then
     size_t_fmt="d"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: %d" >&5
 $as_echo "%d" >&6; }
 elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long"; then
     size_t_fmt="ld"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: %ld" >&5
 $as_echo "%ld" >&6; }
 else
     as_fn_error $? "could not determine the proper format for apr_size_t" "$LINENO" 5
 fi
 
 size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
 $as_echo_n "checking size of off_t... " >&6; }
 if ${ac_cv_sizeof_off_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   ac_cv_sizeof_off_t=8
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <sys/types.h>
 #ifdef WIN32
 #define binmode "b"
 #else
 #define binmode
 #endif
 main()
 {
   FILE *f=fopen("conftestval", "w" binmode);
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(off_t));
   exit(0);
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_sizeof_off_t=`cat conftestval`
 else
   ac_cv_sizeof_off_t=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 
 
 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
     # Enable LFS
     aprlfs=1
     for ac_func in mmap64 sendfile64 sendfilev64 readdir64_r
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
     case $host in
         *-hp-hpux*)
                         ;;
         *)
             for ac_func in mkstemp64
 do :
   ac_fn_c_check_func "$LINENO" "mkstemp64" "ac_cv_func_mkstemp64"
 if test "x$ac_cv_func_mkstemp64" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MKSTEMP64 1
 _ACEOF
 
 fi
 done
 
             ;;
     esac
 elif test "${ac_cv_sizeof_off_t}" != "${ac_cv_sizeof_size_t}"; then
     # unsure of using -gt above is as portable, can can't forsee where
     # off_t can legitimately be smaller than size_t
     aprlfs=1
 else
     aprlfs=0
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which type to use for apr_off_t" >&5
 $as_echo_n "checking which type to use for apr_off_t... " >&6; }
 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
     # LFS is go!
     off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT'
     off_t_value='off64_t'
     off_t_strfn='apr_strtoi64'
 elif test "${ac_cv_sizeof_off_t}x${ac_cv_sizeof_long}" = "4x4"; 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"'
     off_t_strfn='strtol'
 elif test "$ac_cv_type_off_t" = "yes"; then
-    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"'
+    # where int and long are the same size and interchangable.
+    off_t_value=off_t
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether off_t and long use fmt %ld" >&5
+$as_echo_n "checking whether off_t and long use fmt %ld... " >&6; }
+if ${apr_cv_typematch_off_t_long_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "confdefs.h"
+
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+   int main(int argc, const char *const *argv) {
+
+    off_t chk1, *ptr1;
+    long chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%ld %ld", chk1, chk2);
+
+      return 0; }
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_off_t_long_ld=yes
+else
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_off_t_long_ld=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_off_t_long_ld" >&5
+$as_echo "$apr_cv_typematch_off_t_long_ld" >&6; }
+if test "$apr_cv_typematch_off_t_long_ld" = "yes"; then
+    :
+
+        off_t_fmt="#define APR_OFF_T_FMT \"ld\""
         off_t_strfn='strtol'
-    elif test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_int"; then
-        off_t_fmt='#define APR_OFF_T_FMT "d"'
+
+else
+    :
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether off_t and int use fmt %d" >&5
+$as_echo_n "checking whether off_t and int use fmt %d... " >&6; }
+if ${apr_cv_typematch_off_t_int_d+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "confdefs.h"
+
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+   int main(int argc, const char *const *argv) {
+
+    off_t chk1, *ptr1;
+    int chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%d %d", chk1, chk2);
+
+      return 0; }
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_off_t_int_d=yes
+else
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_off_t_int_d=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_off_t_int_d" >&5
+$as_echo "$apr_cv_typematch_off_t_int_d" >&6; }
+if test "$apr_cv_typematch_off_t_int_d" = "yes"; then
+    :
+
+        off_t_fmt="#define APR_OFF_T_FMT \"d\""
         off_t_strfn='strtoi'
-    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:${as_lineno-$LINENO}: checking whether off_t and long long use fmt %lld" >&5
+$as_echo_n "checking whether off_t and long long use fmt %lld... " >&6; }
+if ${apr_cv_typematch_off_t_long_long_lld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "confdefs.h"
+
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+   int main(int argc, const char *const *argv) {
+
+    off_t chk1, *ptr1;
+    long long chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%lld %lld", chk1, chk2);
+
+      return 0; }
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_off_t_long_long_lld=yes
+else
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_off_t_long_long_lld=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_typematch_off_t_long_long_lld" >&5
+$as_echo "$apr_cv_typematch_off_t_long_long_lld" >&6; }
+if test "$apr_cv_typematch_off_t_long_long_lld" = "yes"; then
+    :
+
+        off_t_fmt="#define APR_OFF_T_FMT \"lld\""
+        off_t_strfn='strtoll'
+
+else
+    :
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether off_t and $int64_value use fmt %I64d" >&5
+$as_echo_n "checking whether off_t and $int64_value use fmt %I64d... " >&6; }
+if eval \${apr_cv_typematch_off_t_$int64_value_I64d+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+apr_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $CFLAGS_WARN"
+ if test "$ac_cv_c_compiler_gnu" = "yes"; then
+   CFLAGS="$CFLAGS -Werror"
+ fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "confdefs.h"
+
+   #include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+   int main(int argc, const char *const *argv) {
+
+    off_t chk1, *ptr1;
+    $int64_value chk2, *ptr2 = &chk1;
+    ptr1 = &chk2;
+    *ptr1 = *ptr2 = 0;
+    printf("%I64d %I64d", chk1, chk2);
+
+      return 0; }
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_off_t_$int64_value_I64d=yes
+else
+  CFLAGS=$apr_save_CFLAGS
+apr_cv_typematch_off_t_$int64_value_I64d=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+eval ac_res=\$apr_cv_typematch_off_t_$int64_value_I64d
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test "$apr_cv_typematch_off_t_$int64_value_I64d" = "yes"; then
+    :
+
+        off_t_fmt="#define APR_OFF_T_FMT APR_INT64_T_FMT"
         off_t_strfn='apr_strtoi64'
-    else
-        as_fn_error $? "could not determine the size of off_t" "$LINENO" 5
-    fi
+else
+    :
+
     # Per OS tuning...
     case $host in
     *-mingw*)
         off_t_value=apr_int64_t
         off_t_fmt='#define APR_OFF_T_FMT "I64d"'
         off_t_strfn='_strtoi64'
         ;;
+    *)
+        as_fn_error $? "could not determine the size of off_t" "$LINENO" 5
+        ;;
     esac
+
+fi
+
+fi
+
+fi
+
+fi
+
 else
    # Fallback on int
    off_t_value=apr_int32_t
    off_t_fmt=d
    off_t_strfn='strtoi'
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $off_t_value" >&5
 $as_echo "$off_t_value" >&6; }
 
 # Regardless of whether _LARGEFILE64_SOURCE is used, on some
 # platforms _FILE_OFFSET_BITS will affect the size of ino_t and hence
 # the build-time ABI may be different from the apparent ABI when using
 # APR with another package which *does* define _FILE_OFFSET_BITS.
 # (Exactly as per the case above with off_t where LFS is *not* used)
 #
 # To be safe, hard-code apr_ino_t as 'unsigned long' or 'unsigned int'
 # iff that is exactly the size of ino_t here; otherwise use ino_t as existing
 # releases did.  To be correct, apr_ino_t should have been made an
 # ino64_t as apr_off_t is off64_t, but this can't be done now without
 # breaking ABI.
 
 # Per OS tuning...
 case $host in
 *mingw*)
     ino_t_value=apr_int64_t
     ;;
 *)
     ino_t_value=ino_t
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ino_t" >&5
 $as_echo_n "checking size of ino_t... " >&6; }
 if ${ac_cv_sizeof_ino_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   ac_cv_sizeof_ino_t=$ac_cv_sizeof_long
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 $ac_includes_default
 #ifdef WIN32
 #define binmode "b"
 #else
 #define binmode
 #endif
 main()
 {
   FILE *f=fopen("conftestval", "w" binmode);
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(ino_t));
   exit(0);
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_sizeof_ino_t=`cat conftestval`
 else
   ac_cv_sizeof_ino_t=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ino_t" >&5
 $as_echo "$ac_cv_sizeof_ino_t" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_INO_T $ac_cv_sizeof_ino_t
 _ACEOF
 
 
     if test $ac_cv_sizeof_ino_t = 4; then
         if test $ac_cv_sizeof_long = 4; then
             ino_t_value="unsigned long"
         else
             ino_t_value="unsigned int"
         fi
     fi
     ;;
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: using $ino_t_value for ino_t" >&5
 $as_echo "$as_me: using $ino_t_value for ino_t" >&6;}
 
 # Checks for endianness
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __APPLE_CC__
 	       not a universal capable compiler
 	     #endif
 	     typedef int dummy;
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 	# Check for potential -arch flags.  It is not universal unless
 	# there are at least two -arch flags with different values.
 	ac_arch=
 	ac_prev=
 	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
 	 if test -n "$ac_prev"; then
 	   case $ac_word in
 	     i?86 | x86_64 | ppc | ppc64)
 	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
 		 ac_arch=$ac_word
 	       else
 		 ac_cv_c_bigendian=universal
 		 break
 	       fi
 	       ;;
 	   esac
 	   ac_prev=
 	 elif test "x$ac_word" = "x-arch"; then
 	   ac_prev=arch
 	 fi
        done
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 	     #include <sys/param.h>
 
 int
 main ()
 {
 #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
 		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
 		     && LITTLE_ENDIAN)
 	      bogus endian macros
 	     #endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
 		 not big endian
 		#endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
 else
   ac_cv_c_bigendian=no
 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
     if test $ac_cv_c_bigendian = unknown; then
       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
 int
 main ()
 {
 #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 	      bogus endian macros
 	     #endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   # It does; now see whether it defined to _BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
 int
 main ()
 {
 #ifndef _BIG_ENDIAN
 		 not big endian
 		#endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
 else
   ac_cv_c_bigendian=no
 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
     if test $ac_cv_c_bigendian = unknown; then
       # Compile a test program.
       if test "$cross_compiling" = yes; then :
   # Try to guess by grepping values from an object file.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 short int ascii_mm[] =
 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
 		short int ascii_ii[] =
 		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 		int use_ascii (int i) {
 		  return ascii_mm[i] + ascii_ii[i];
 		}
 		short int ebcdic_ii[] =
 		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
 		short int ebcdic_mm[] =
 		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 		int use_ebcdic (int i) {
 		  return ebcdic_mm[i] + ebcdic_ii[i];
 		}
 		extern int foo;
 
 int
 main ()
 {
 return use_ascii (foo) == use_ebcdic (foo);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
 	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
 	      if test "$ac_cv_c_bigendian" = unknown; then
 		ac_cv_c_bigendian=no
 	      else
 		# finding both strings is unlikely to happen, but who knows?
 		ac_cv_c_bigendian=unknown
 	      fi
 	    fi
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 
 	     /* Are we little or big endian?  From Harbison&Steele.  */
 	     union
 	     {
 	       long int l;
 	       char c[sizeof (long int)];
 	     } u;
 	     u.l = 1;
 	     return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_bigendian=no
 else
   ac_cv_c_bigendian=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
 $as_echo "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
      $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
       ;; #(
    universal)
 
 $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
      as_fn_error $? "unknown endianness
  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 if test $ac_cv_c_bigendian = yes; then
     bigendian=1
 else
     bigendian=0
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of struct iovec" >&5
 $as_echo_n "checking size of struct iovec... " >&6; }
 if ${ac_cv_sizeof_struct_iovec+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   ac_cv_sizeof_struct_iovec=0
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #ifdef WIN32
 #define binmode "b"
 #else
 #define binmode
 #endif
 main()
 {
   FILE *f=fopen("conftestval", "w" binmode);
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(struct iovec));
   exit(0);
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_sizeof_struct_iovec=`cat conftestval`
 else
   ac_cv_sizeof_struct_iovec=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_struct_iovec" >&5
 $as_echo "$ac_cv_sizeof_struct_iovec" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_STRUCT_IOVEC $ac_cv_sizeof_struct_iovec
 _ACEOF
 
 
 if test "$ac_cv_sizeof_struct_iovec" = "0"; then
     have_iovec=0
 else
     have_iovec=1
 fi
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 for ac_func in strnicmp
 do :
   ac_fn_c_check_func "$LINENO" "strnicmp" "ac_cv_func_strnicmp"
 if test "x$ac_cv_func_strnicmp" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRNICMP 1
 _ACEOF
  have_strnicmp="1"
 else
   have_strnicmp="0"
 fi
 done
 
 for ac_func in strncasecmp
 do :
   ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
 if test "x$ac_cv_func_strncasecmp" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRNCASECMP 1
 _ACEOF
  have_strncasecmp="1"
 else
   have_strncasecmp="0"
 fi
 done
 
 for ac_func in stricmp
 do :
   ac_fn_c_check_func "$LINENO" "stricmp" "ac_cv_func_stricmp"
 if test "x$ac_cv_func_stricmp" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRICMP 1
 _ACEOF
  have_stricmp="1"
 else
   have_stricmp="0"
 fi
 done
 
 for ac_func in strcasecmp
 do :
   ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
 if test "x$ac_cv_func_strcasecmp" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRCASECMP 1
 _ACEOF
  have_strcasecmp="1"
 else
   have_strcasecmp="0"
 fi
 done
 
 for ac_func in strdup
 do :
   ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
 if test "x$ac_cv_func_strdup" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRDUP 1
 _ACEOF
  have_strdup="1"
 else
   have_strdup="0"
 fi
 done
 
 for ac_func in strstr
 do :
   ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
 if test "x$ac_cv_func_strstr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRSTR 1
 _ACEOF
  have_strstr="1"
 else
   have_strstr="0"
 fi
 done
 
 for ac_func in memchr
 do :
   ac_fn_c_check_func "$LINENO" "memchr" "ac_cv_func_memchr"
 if test "x$ac_cv_func_memchr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MEMCHR 1
 _ACEOF
  have_memchr="1"
 else
   have_memchr="0"
 fi
 done
 
 as_ac_var=`$as_echo "ac_cv_func_$int64_strfn" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$int64_strfn" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   have_int64_strfn="1"
 else
   have_int64_strfn="0"
 fi
 
 
 if test "$have_int64_strfn" = "0" && test "$int64_strfn" = "strtoll"; then
     int64_strfn="strtoq"
     ac_fn_c_check_func "$LINENO" "strtoq" "ac_cv_func_strtoq"
 if test "x$ac_cv_func_strtoq" = xyes; then :
   have_int64_strfn=1
 else
   have_int64_strfn=0
 fi
 
 fi
 
 if test "$have_int64_strfn" = "1"; then
 
 cat >>confdefs.h <<_ACEOF
 #define APR_INT64_STRFN $int64_strfn
 _ACEOF
 
 fi
 
 
 
 
 
 
 
 
 
 if test "$off_t_strfn" = "apr_strtoi64" && test "$have_int64_strfn" = "1"; then
     off_t_strfn=$int64_strfn
 fi
 
 cat >>confdefs.h <<_ACEOF
 #define APR_OFF_T_STRFN $off_t_strfn
 _ACEOF
 
 
 echo "${nl}Checking for DSO..."
 # Check whether --enable-dso was given.
 if test "${enable_dso+set}" = set; then :
   enableval=$enable_dso; if test "x$enableval" = "xyes"; then
       dsotype=any
    else
       dsotype=$enableval
    fi
 
 else
   dsotype=any
 fi
 
 
 if test "$dsotype" = "any"; then
     if test "$dsotype" = "any"; then
       case $host in
         *darwin[0-8]\.*)
           # Original Darwin, not for 9.0!:
           ac_fn_c_check_func "$LINENO" "NSLinkModule" "ac_cv_func_NSLinkModule"
 if test "x$ac_cv_func_NSLinkModule" = xyes; then :
   dsotype=dyld
 fi
 ;;
         hppa*-hpux[1-9]\.*|hppa*-hpux1[01]*)
           # shl is specific to parisc hpux SOM binaries, not used for 64 bit
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
 if ${ac_cv_lib_dld_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
   ac_cv_lib_dld_shl_load=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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" = xyes; then :
   have_shl=1
 fi
 
           if test "$ac_cv_sizeof_voidp$have_shl" = "41"; then
             dsotype=shl;
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
           fi;;
         *mingw*|*-os2*)
           # several 'other's below probably belong up here.  If they always
           # use a platform implementation and shouldn't test the dlopen/dlfcn
           # features, then bring them up here.
           # But if they -should- optionally use dlfcn, and/or need the config
           # detection of dlopen/dlsym, do not move them up.
           dsotype=other ;;
       esac
     fi
     # Normal POSIX:
     if test "$dsotype" = "any"; then
       ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes; then :
   dsotype=dlfcn
 fi
 
     fi
     if test "$dsotype" = "any"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
   ac_cv_lib_dl_dlopen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   dsotype=dlfcn;
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 fi
 
     fi
     if test "$dsotype" = "dlfcn"; then
         # ReliantUnix has dlopen() in libc but dlsym() in libdl :(
         ac_fn_c_check_func "$LINENO" "dlsym" "ac_cv_func_dlsym"
 if test "x$ac_cv_func_dlsym" = xyes; then :
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
 $as_echo_n "checking for dlsym in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlsym+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlsym=yes
 else
   ac_cv_lib_dl_dlsym=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
 $as_echo "$ac_cv_lib_dl_dlsym" >&6; }
 if test "x$ac_cv_lib_dl_dlsym" = xyes; then :
 
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
 else
   dsotype=any
               echo "Weird: dlopen() was found but dlsym() was not found!"
 fi
 
 fi
 
     fi
     if test "$dsotype" = "any"; then
       # BeOS:
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for load_image in -lroot" >&5
 $as_echo_n "checking for load_image in -lroot... " >&6; }
 if ${ac_cv_lib_root_load_image+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root_load_image=yes
 else
   ac_cv_lib_root_load_image=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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" = xyes; then :
   dsotype=other
 fi
 
     fi
     # Everything else:
     if test "$dsotype" = "any"; then
         case $host in
         *os390|*os400|*-aix*)
           # Some -aix5 will use dl, no hassles.  Keep that pattern here.
           dsotype=other ;;
         *-hpux*)
           if test "$have_shl" = "1"; then
             dsotype=shl;
   if test "x$LIBS" = "x"; then
     test "x$silent" != "xyes" && 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
         test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
         LIBS="$LIBS $i"
       fi
     done
   fi
 
           fi;;
         esac
     fi
 fi
 
 if test "$dsotype" = "any"; then
     as_fn_error $? "Could not detect suitable DSO implementation" "$LINENO" 5
 elif test "$dsotype" = "no"; then
     aprdso="0"
 else
     case "$dsotype" in
     dlfcn)
 $as_echo "#define DSO_USE_DLFCN 1" >>confdefs.h
 ;;
     shl)
 $as_echo "#define DSO_USE_SHL 1" >>confdefs.h
 ;;
     dyld)
 $as_echo "#define DSO_USE_DYLD 1" >>confdefs.h
 ;;
     other) ;; # Use whatever is in dso/OSDIR
     *) as_fn_error $? "Unknown DSO implementation \"$dsotype\"" "$LINENO" 5;;
     esac
     aprdso="1"
     apr_modules="$apr_modules dso"
 fi
 
 
 
 echo "${nl}Checking for Processes..."
 
 for ac_func in waitpid
 do :
   ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid"
 if test "x$ac_cv_func_waitpid" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_WAITPID 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
 
 
 
 
 if test -z "$have_proc_invoked"; then
   have_proc_invoked="0"
 fi
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Variable Length Arrays" >&5
 $as_echo_n "checking for Variable Length Arrays... " >&6; }
 apr_save_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS $CFLAGS_WARN"
  if test "$ac_cv_c_compiler_gnu" = "yes"; then
    CFLAGS="$CFLAGS -Werror"
  fi
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "confdefs.h"
 
 
    int main(int argc, const char *const *argv) {
 
     int foo[argc];
     foo[0] = 0;
 
       return 0; }
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  vla_msg=yes
+  CFLAGS=$apr_save_CFLAGS
+vla_msg=yes
 else
-  vla_msg=no
+  CFLAGS=$apr_save_CFLAGS
+vla_msg=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$apr_save_CFLAGS
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vla_msg" >&5
 $as_echo "$vla_msg" >&6; }
 if test "$vla_msg" = "yes"; then
 
 $as_echo "#define HAVE_VLA 1" >>confdefs.h
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking struct rlimit" >&5
 $as_echo_n "checking struct rlimit... " >&6; }
 if ${ac_cv_struct_rlimit+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 if test "$cross_compiling" = yes; then :
 
     ac_cv_struct_rlimit=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_struct_rlimit=yes
 else
 
     ac_cv_struct_rlimit=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
+for ac_func in semget semctl semop semtimedop flock
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = 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 OS.h
+ac_rc=yes
+for ac_spec in func:semtimedop; 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
+    :
+    have_semtimedop="1"
+else
+    :
+    have_semtimedop="0"
+fi
+
+
+for ac_header in semaphore.h
 do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "semaphore.h" "ac_cv_header_semaphore_h" "$ac_includes_default"
+if test "x$ac_cv_header_semaphore_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SEMAPHORE_H 1
 _ACEOF
 
 fi
 
 done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_open" >&5
 $as_echo_n "checking for library containing sem_open... " >&6; }
 if ${ac_cv_search_sem_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 sem_open ();
 int
 main ()
 {
 return sem_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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_sem_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_sem_open+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_sem_open+:} false; then :
 
 else
   ac_cv_search_sem_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sem_open" >&5
 $as_echo "$ac_cv_search_sem_open" >&6; }
 ac_res=$ac_cv_search_sem_open
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-for ac_func in sem_close sem_unlink sem_post sem_wait create_sem
+for ac_func in sem_close sem_unlink sem_post sem_wait sem_timedwait
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
+ac_rc=yes
+for ac_spec in func:sem_timedwait; 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
+    :
+    have_sem_timedwait="1"
+else
+    :
+    have_sem_timedwait="0"
+fi
 
+
+for ac_header in OS.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "OS.h" "ac_cv_header_OS_h" "$ac_includes_default"
+if test "x$ac_cv_header_OS_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OS_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_func in create_sem acquire_sem acquire_sem_etc
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ac_rc=yes
+for ac_spec in header:OS.h func:acquire_sem_etc; 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
+    :
+    have_acquire_sem_etc="1"
+else
+    :
+    have_acquire_sem_etc="0"
+fi
+
+
 # Some systems return ENOSYS from sem_open.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working sem_open" >&5
 $as_echo_n "checking for working sem_open... " >&6; }
 if ${ac_cv_func_sem_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 if test "$cross_compiling" = yes; then :
   ac_cv_func_sem_open=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <errno.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <semaphore.h>
 #ifndef SEM_FAILED
 #define SEM_FAILED (-1)
 #endif
 main()
 {
     sem_t *psem;
     const char *sem_name = "/apr_autoconf";
 
     psem = sem_open(sem_name, O_CREAT, 0644, 1);
     if (psem == (sem_t *)SEM_FAILED) {
 	exit(1);
     }
     sem_close(psem);
     psem = sem_open(sem_name, O_CREAT | O_EXCL, 0644, 1);
     if (psem != (sem_t *)SEM_FAILED) {
         sem_close(psem);
         exit(1);
     }
     sem_unlink(sem_name);
     exit(0);
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_sem_open=yes
 else
   ac_cv_func_sem_open=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for union semun in sys/sem.h" >&5
 $as_echo_n "checking for union semun in sys/sem.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
   have_union_semun="1" union_semun=yes
 msg=yes
 else
 
 have_union_semun="0"
 msg=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
 $as_echo "$msg" >&6; }
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOCK_EX in sys/file.h" >&5
 $as_echo_n "checking for LOCK_EX in sys/file.h... " >&6; }
 if ${ac_cv_define_LOCK_EX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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
 
 $as_echo "#define HAVE_LOCK_EX 1" >>confdefs.h
 
   fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for F_SETLK in fcntl.h" >&5
 $as_echo_n "checking for F_SETLK in fcntl.h... " >&6; }
 if ${ac_cv_define_F_SETLK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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
 
 $as_echo "#define HAVE_F_SETLK 1" >>confdefs.h
 
   fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SEM_UNDO in sys/sem.h" >&5
 $as_echo_n "checking for SEM_UNDO in sys/sem.h... " >&6; }
 if ${ac_cv_define_SEM_UNDO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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
 
 $as_echo "#define HAVE_SEM_UNDO 1" >>confdefs.h
 
   fi
 
 
 # We are assuming that if the platform doesn't have POLLIN, it doesn't have
 # any POLL definitions.
 
   { $as_echo "$as_me:${as_lineno-$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 ${ac_cv_define_POLLIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     ac_cv_define_POLLIN=no
     for curhdr in poll.h sys/poll.h
     do
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$LINENO}: result: $ac_cv_define_POLLIN" >&5
 $as_echo "$ac_cv_define_POLLIN" >&6; }
   if test "$ac_cv_define_POLLIN" = "yes"; then
 
 $as_echo "#define HAVE_POLLIN 1" >>confdefs.h
 
   fi
 
 
 if test "$threads" = "1"; then
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PROCESS_SHARED in pthread.h" >&5
 $as_echo_n "checking for PTHREAD_PROCESS_SHARED in pthread.h... " >&6; }
 if ${ac_cv_define_PTHREAD_PROCESS_SHARED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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
 
 $as_echo "#define HAVE_PTHREAD_PROCESS_SHARED 1" >>confdefs.h
 
   fi
 
-    for ac_func in pthread_mutexattr_setpshared
+    for ac_func in pthread_mutex_timedlock pthread_mutexattr_setpshared
 do :
-  ac_fn_c_check_func "$LINENO" "pthread_mutexattr_setpshared" "ac_cv_func_pthread_mutexattr_setpshared"
-if test "x$ac_cv_func_pthread_mutexattr_setpshared" = xyes; then :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
+    ac_rc=yes
+for ac_spec in header:pthread.h func:pthread_mutex_timedlock; 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
+    :
+    have_pthread_mutex_timedlock="1"
+else
+    :
+    have_pthread_mutex_timedlock="0"
+fi
+
+
     # 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:${as_lineno-$LINENO}: checking for working PROCESS_SHARED locks" >&5
 $as_echo_n "checking for working PROCESS_SHARED locks... " >&6; }
 if ${apr_cv_process_shared_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
       if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
 See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_process_shared_works=yes
 else
   apr_cv_process_shared_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for robust cross-process mutex support" >&5
 $as_echo_n "checking for robust cross-process mutex support... " >&6; }
 if ${apr_cv_mutex_robust_shared+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
 See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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))
+    if (pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST))
         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
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_mutex_robust_shared=yes
 else
+
+if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_run "$LINENO"; then :
+  apr_cv_mutex_robust_shared=np
+else
   apr_cv_mutex_robust_shared=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define HAVE_PTHREAD_MUTEX_ROBUST 1" >>confdefs.h
 
+elif test "$apr_cv_mutex_robust_shared" = "np"; then
+
+$as_echo "#define HAVE_PTHREAD_MUTEX_ROBUST_NP 1" >>confdefs.h
+
 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
+for ac_spec in func:semget func:semctl func:semop 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 header:OS.h func:create_sem; 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
     :
     hasbeossem="1"
 else
     :
     hasbeossem="0"
 fi
 
 
+for ac_func in pthread_condattr_setpshared
+do :
+  ac_fn_c_check_func "$LINENO" "pthread_condattr_setpshared" "ac_cv_func_pthread_condattr_setpshared"
+if test "x$ac_cv_func_pthread_condattr_setpshared" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_CONDATTR_SETPSHARED 1
+_ACEOF
+
+fi
+done
+
+ac_rc=yes
+for ac_spec in header:pthread.h func:pthread_condattr_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
+    :
+    have_pthread_condattr_setpshared="1"
+else
+    :
+    have_pthread_condattr_setpshared="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.
 # The BEOSSEM decision doesn't require any substitutions but is
 # included here to prevent the fcntl() branch being selected
 # from the decision making.
 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
+for ac_spec in func:semget func:semctl func:semop 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
 
 ac_rc=yes
-for ac_spec in header:OS.h func:create_sem; do
+for ac_spec in header:OS.h func:create_sem func:acquire_sem func:acquire_sem_etc; 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_BEOSSEM'
 ac_decision_msg='BeOS Semaphores'
 ac_decision_USE_BEOSSEM=yes
 ac_decision_USE_BEOSSEM_msg='BeOS Semaphores'
 
 else
     :
 
 fi
 
+# pthread mutex both pshared and robust[_np] is the best default
+case "$apr_cv_mutex_robust_shared" in
+"yes"|"np")
+
+ac_decision='USE_PROC_PTHREAD_SERIALIZE'
+ac_decision_msg='pthread pshared mutex'
+ac_decision_USE_PROC_PTHREAD_SERIALIZE=yes
+ac_decision_USE_PROC_PTHREAD_SERIALIZE_msg='pthread pshared mutex'
+
+    ;;
+*)
+    ;;
+esac
 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:${as_lineno-$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"
         ;;
     USE_BEOSSEM )
         beossem="1"
         ;;
 esac
 
 if test $hasfcntlser = "1"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fcntl returns EACCES when F_SETLK is already held" >&5
 $as_echo_n "checking if fcntl returns EACCES when F_SETLK is already held... " >&6; }
 if test "$cross_compiling" = yes; then :
   apr_fcntl_tryacquire_eacces=0
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
 #include <fcntl.h>
 #include <errno.h>
 
 int fd;
 struct flock proc_mutex_lock_it = {0};
 const char *fname = "conftest.fcntl";
 
 int main()
 {
     int rc, status;;
     proc_mutex_lock_it.l_whence = SEEK_SET;   /* from current point */
     proc_mutex_lock_it.l_type = F_WRLCK;      /* set exclusive/write lock */
 
     fd = creat(fname, S_IRWXU);
     unlink(fname);
 
     if (rc = lockit()) {
         exit(-1);
     }
 
     if (fork()) {
         wait(&status);
     }
     else {
       return(lockit());
     }
 
     close(fd);
     exit(WEXITSTATUS(status) != EACCES);
 }
 
 int lockit() {
     int rc;
     do {
         rc = fcntl(fd, F_SETLK, &proc_mutex_lock_it);
     } while ( rc < 0 && errno == EINTR);
 
     return (rc < 0) ? errno : 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_fcntl_tryacquire_eacces=1
 else
   apr_fcntl_tryacquire_eacces=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 
 if test "$apr_fcntl_tryacquire_eacces" = "1"; then
 
 $as_echo "#define FCNTL_TRYACQUIRE_EACCES 1" >>confdefs.h
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
     proclockglobal="0"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define POSIXSEM_IS_GLOBAL 1" >>confdefs.h
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define SYSVSEM_IS_GLOBAL 1" >>confdefs.h
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define FCNTL_IS_GLOBAL 1" >>confdefs.h
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define FLOCK_IS_GLOBAL 1" >>confdefs.h
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
+for ac_header in sys/random.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/random.h" "ac_cv_header_sys_random_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_random_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_RANDOM_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_func in getrandom
+do :
+  ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom"
+if test "x$ac_cv_func_getrandom" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETRANDOM 1
+_ACEOF
+
+fi
+done
+
+
+for ac_header in sys/syscall.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/syscall.h" "ac_cv_header_sys_syscall_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_syscall_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_SYSCALL_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in linux/random.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "linux/random.h" "ac_cv_header_linux_random_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_random_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LINUX_RANDOM_H 1
+_ACEOF
+
+fi
+
+done
+
+ac_fn_c_check_decl "$LINENO" "SYS_getrandom" "ac_cv_have_decl_SYS_getrandom" "#include <sys/syscall.h>
+"
+if test "x$ac_cv_have_decl_SYS_getrandom" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SYS_GETRANDOM $ac_have_decl
+_ACEOF
+
+
+for ac_func in arc4random_buf
+do :
+  ac_fn_c_check_func "$LINENO" "arc4random_buf" "ac_cv_func_arc4random_buf"
+if test "x$ac_cv_func_arc4random_buf" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ARC4RANDOM_BUF 1
+_ACEOF
+
+fi
+done
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for entropy source" >&5
 $as_echo_n "checking for entropy source... " >&6; }
 
 why_no_rand=""
 
 
 # Check whether --with-egd was given.
 if test "${with_egd+set}" = set; then :
   withval=$with_egd;
 $as_echo "#define HAVE_EGD 1" >>confdefs.h
 
     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:${as_lineno-$LINENO}: result: EGD-compatible daemon" >&5
 $as_echo "EGD-compatible daemon" >&6; }
     rand="1"
 
 fi
 
 
 if test "$rand" != "1"; then
+  if test "$ac_cv_func_getrandom" = yes; then
+    rand="getrandom"
+  elif test "$ac_cv_have_decl_SYS_getrandom" = yes; then
+    rand="SYS_getrandom"
+  elif test "$ac_cv_func_arc4random_buf" = yes; then
+    rand="arc4random"
+  fi
+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"
+   apr_devrandom="no"
 fi
 
+  if test "$apr_devrandom" = "no"; then
+    if test -z "$rand"; then
+      apr_devrandom="yes"
+    else
+      apr_devrandom="no"
+    fi
+  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/urandom /dev/random; do
       if test -r $f; then
         apr_devrandom=$f
-        rand=1
+        rand="1"
         break
       fi
     done
   elif test "$apr_devrandom" != "no"; then
     if test -r "$apr_devrandom"; then
       rand="1"
     else
       as_fn_error $? "$apr_devrandom not found or unreadable." "$LINENO" 5
     fi
   fi
 
   if test "$rand" = "1"; then
     case $host in
       *os390)
         if test $os_version -lt 1700; then
           rand="0"
           why_no_rand=" ($apr_devrandom unusable on z/OS before V1R7)"
         fi
         ;;
     esac
   fi
 
   if test "$rand" = "1"; then
 
 cat >>confdefs.h <<_ACEOF
 #define DEV_RANDOM "$apr_devrandom"
 _ACEOF
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_devrandom" >&5
 $as_echo "$apr_devrandom" >&6; }
+  elif test -n "$rand"; then
+
+cat >>confdefs.h <<_ACEOF
+#define SYS_RANDOM "$rand"
+_ACEOF
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rand" >&5
+$as_echo "$rand" >&6; }
+    rand="1"
   fi
 fi
 
 if test "$rand" != "1"; then
     case $host in
         # we have built in support for OS/2
         *-os2*)
             { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define HAVE_TRUERAND 1" >>confdefs.h
 
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: truerand" >&5
 $as_echo "truerand" >&6; }
                 rand="1"
               else
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found$why_no_rand" >&5
 $as_echo "not found$why_no_rand" >&6; }
                 rand="0"
               fi
             fi
             ;;
     esac
 fi
 
 
 
 echo "${nl}Checking for File Info Support..."
 ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 "
 if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_BLOCKS 1
 _ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 "
 if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_ATIMENSEC 1
 _ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_ctimensec" "ac_cv_member_struct_stat_st_ctimensec" "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 "
 if test "x$ac_cv_member_struct_stat_st_ctimensec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_CTIMENSEC 1
 _ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimensec" "ac_cv_member_struct_stat_st_mtimensec" "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 "
 if test "x$ac_cv_member_struct_stat_st_mtimensec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
 _ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.tv_nsec" "ac_cv_member_struct_stat_st_atim_tv_nsec" "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 "
 if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
 _ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_ctim.tv_nsec" "ac_cv_member_struct_stat_st_ctim_tv_nsec" "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 "
 if test "x$ac_cv_member_struct_stat_st_ctim_tv_nsec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC 1
 _ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim.tv_nsec" "ac_cv_member_struct_stat_st_mtim_tv_nsec" "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 "
 if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
 _ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_atime_n" "ac_cv_member_struct_stat_st_atime_n" "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 "
 if test "x$ac_cv_member_struct_stat_st_atime_n" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_ATIME_N 1
 _ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_ctime_n" "ac_cv_member_struct_stat_st_ctime_n" "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 "
 if test "x$ac_cv_member_struct_stat_st_ctime_n" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_CTIME_N 1
 _ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtime_n" "ac_cv_member_struct_stat_st_mtime_n" "
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 "
 if test "x$ac_cv_member_struct_stat_st_mtime_n" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_MTIME_N 1
 _ACEOF
 
 
 fi
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inode member of struct dirent" >&5
 $as_echo_n "checking for inode member of struct dirent... " >&6; }
 if ${apr_cv_dirent_inode+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 apr_cv_dirent_inode=no
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
   apr_cv_dirent_inode=d_fileno
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 if test "$apr_cv_dirent_inode" = "no"; then
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
   apr_cv_dirent_inode=d_ino
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for file type member of struct dirent" >&5
 $as_echo_n "checking for file type member of struct dirent... " >&6; }
 if ${apr_cv_dirent_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 apr_cv_dirent_type=no
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
 #include <dirent.h>
 
 int
 main ()
 {
 
 struct dirent de; de.d_type = DT_REG;
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   apr_cv_dirent_type=d_type
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 
 echo "${nl}Checking for OS UUID Support..."
 
 for ac_header in uuid.h uuid/uuid.h sys/uuid.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
 
 done
 
 
 apr_revert_save_LIBS=$LIBS
 
 # Prefer the flavor(s) that live in libc;
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_create" >&5
 $as_echo_n "checking for library containing uuid_create... " >&6; }
 if ${ac_cv_search_uuid_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 uuid_create ();
 int
 main ()
 {
 return uuid_create ();
   ;
   return 0;
 }
 _ACEOF
 for ac_lib in '' uuid; 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_uuid_create=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_uuid_create+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_uuid_create+:} false; then :
 
 else
   ac_cv_search_uuid_create=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_create" >&5
 $as_echo "$ac_cv_search_uuid_create" >&6; }
 ac_res=$ac_cv_search_uuid_create
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate" >&5
 $as_echo_n "checking for library containing uuid_generate... " >&6; }
 if ${ac_cv_search_uuid_generate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 uuid_generate ();
 int
 main ()
 {
 return uuid_generate ();
   ;
   return 0;
 }
 _ACEOF
 for ac_lib in '' uuid; 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_uuid_generate=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_uuid_generate+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_uuid_generate+:} false; then :
 
 else
   ac_cv_search_uuid_generate=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate" >&5
 $as_echo "$ac_cv_search_uuid_generate" >&6; }
 ac_res=$ac_cv_search_uuid_generate
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 if test "$ac_cv_search_uuid_create" = "none required" -o \
         "$ac_cv_search_uuid_generate" = "none required"; then
  LIBS=$apr_revert_save_LIBS
 fi
 
 for ac_func in uuid_create uuid_generate
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for os uuid usability" >&5
 $as_echo_n "checking for os uuid usability... " >&6; }
 if ${apr_cv_osuuid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 # Ensure this test closely mirrors misc/unix/rand.c!
 uuid_includes="
 #if defined(HAVE_SYS_TYPES_H)
 #include <sys/types.h>
 #endif
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
 #if defined(HAVE_UUID_H)
 #include <uuid.h>
 #elif defined(HAVE_UUID_UUID_H)
 #include <uuid/uuid.h>
 #elif defined(HAVE_SYS_UUID_H)
 #include <sys/uuid.h>
 #endif
 "
  apr_cv_osuuid=no
  if test $ac_cv_func_uuid_create = yes; then
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $uuid_includes
 int
 main ()
 {
 
     uuid_t g;
     uint32_t s;
     uuid_create(&g, &s);
     if (s == uuid_s_ok) s = 0;
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   apr_cv_osuuid=yes
 else
   apr_cv_func_uuid_create=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
  fi
  if test $ac_cv_func_uuid_generate = yes; then
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $uuid_includes
 int
 main ()
 {
 
     uuid_t g;
     uuid_generate(g);
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   apr_cv_osuuid=yes
 else
   apr_cv_func_uuid_generate=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
  fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_osuuid" >&5
 $as_echo "$apr_cv_osuuid" >&6; }
 
 if test $apr_cv_osuuid = yes; then
   osuuid="1"
 else
   osuuid="0"
   LIBS=$apr_revert_save_LIBS
 fi
 
 
 
 echo "${nl}Checking for Time Support..."
 
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "
 #include <sys/types.h>
 #include <time.h>
 "
 if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_TM_TM_GMTOFF 1
 _ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct tm" "__tm_gmtoff" "ac_cv_member_struct_tm___tm_gmtoff" "
 #include <sys/types.h>
 #include <time.h>
 "
 if test "x$ac_cv_member_struct_tm___tm_gmtoff" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_TM___TM_GMTOFF 1
 _ACEOF
 
 
 fi
 
 
 echo "${nl}Checking for Networking support..."
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type in_addr" >&5
 $as_echo_n "checking for type in_addr... " >&6; }
 if ${ac_cv_type_in_addr+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 
 int
 main ()
 {
 
  struct in_addr arg;
  arg.s_addr = htonl(INADDR_ANY);
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_type_in_addr="yes"
 else
 
 ac_cv_type_in_addr="no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_in_addr" >&5
 $as_echo "$ac_cv_type_in_addr" >&6; }
 
 if test "$ac_cv_type_in_addr" = "yes"; then
   have_in_addr="1"
 else
   have_in_addr="0"
 fi
 
 { $as_echo "$as_me:${as_lineno-$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
 
 
 
 
 if test "$ac_cv_func_poll $file_as_socket" = "yes 1"; then
 
 $as_echo "#define WAITIO_USES_POLL 1" >>confdefs.h
 
 fi
 
 # Check the types only if we have gethostbyname_r
 if test "$ac_cv_func_gethostbyname_r" = "yes"; then
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking style of gethostbyname_r routine" >&5
 $as_echo_n "checking style of gethostbyname_r routine... " >&6; }
 if ${ac_cv_gethostbyname_r_style+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   apr_save_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS $CFLAGS_WARN"
  if test "$ac_cv_c_compiler_gnu" = "yes"; then
    CFLAGS="$CFLAGS -Werror"
  fi
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #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);
 /* use tmp to suppress the warning */
 tmp=0;
 
       return 0; }
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_gethostbyname_r_style=glibc2
+  CFLAGS=$apr_save_CFLAGS
+ac_cv_gethostbyname_r_style=glibc2
 else
-  ac_cv_gethostbyname_r_style=none
+  CFLAGS=$apr_save_CFLAGS
+ac_cv_gethostbyname_r_style=none
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$apr_save_CFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define GETHOSTBYNAME_R_GLIBC2 1" >>confdefs.h
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking 3rd argument to the gethostbyname_r routines" >&5
 $as_echo_n "checking 3rd argument to the gethostbyname_r routines... " >&6; }
 if ${ac_cv_gethostbyname_r_arg+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   apr_save_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS $CFLAGS_WARN"
  if test "$ac_cv_c_compiler_gnu" = "yes"; then
    CFLAGS="$CFLAGS -Werror"
  fi
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #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);
 /* use tmp to suppress the warning */
 tmp=0;
 
       return 0; }
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_gethostbyname_r_arg=hostent_data
+  CFLAGS=$apr_save_CFLAGS
+ac_cv_gethostbyname_r_arg=hostent_data
 else
-  ac_cv_gethostbyname_r_arg=char
+  CFLAGS=$apr_save_CFLAGS
+ac_cv_gethostbyname_r_arg=char
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$apr_save_CFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define GETHOSTBYNAME_R_HOSTENT_DATA 1" >>confdefs.h
 
 fi
 
 fi
 
 # Check the types only if we have getservbyname_r
 if test "$ac_cv_func_getservbyname_r" = "yes"; then
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking style of getservbyname_r routine" >&5
 $as_echo_n "checking style of getservbyname_r routine... " >&6; }
 if ${ac_cv_getservbyname_r_style+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 apr_save_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS $CFLAGS_WARN"
  if test "$ac_cv_c_compiler_gnu" = "yes"; then
    CFLAGS="$CFLAGS -Werror"
  fi
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #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 = getservbyname_r((const char *) 0, (const char *) 0,
                           (struct servent *) 0, (char *) 0, 0,
                           (struct servent **) 0);
 /* use tmp to suppress the warning */
 tmp=0;
 
       return 0; }
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_getservbyname_r_style=glibc2
+  CFLAGS=$apr_save_CFLAGS
+ac_cv_getservbyname_r_style=glibc2
 else
-  ac_cv_getservbyname_r_style=none
+  CFLAGS=$apr_save_CFLAGS
+ac_cv_getservbyname_r_style=none
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$apr_save_CFLAGS
 
 
 if test "$ac_cv_getservbyname_r_style" = "none"; then
             apr_save_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS $CFLAGS_WARN"
  if test "$ac_cv_c_compiler_gnu" = "yes"; then
    CFLAGS="$CFLAGS -Werror"
  fi
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #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) {
 
     struct servent *tmp = getservbyname_r((const char *) 0, (const char *) 0,
                                           (struct servent *) 0, (char *) 0, 0);
     /* use tmp to suppress the warning */
     tmp=NULL;
 
       return 0; }
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_getservbyname_r_style=solaris
+  CFLAGS=$apr_save_CFLAGS
+ac_cv_getservbyname_r_style=solaris
 else
-  ac_cv_getservbyname_r_style=none
+  CFLAGS=$apr_save_CFLAGS
+ac_cv_getservbyname_r_style=none
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$apr_save_CFLAGS
 
 fi
 
 if test "$ac_cv_getservbyname_r_style" = "none"; then
             apr_save_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS $CFLAGS_WARN"
  if test "$ac_cv_c_compiler_gnu" = "yes"; then
    CFLAGS="$CFLAGS -Werror"
  fi
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #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 = getservbyname_r((const char *) 0, (const char *) 0,
                               (struct servent *) 0, (struct servent_data *) 0);
     /* use tmp to suppress the warning */
     tmp=0;
 
       return 0; }
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_getservbyname_r_style=osf1
+  CFLAGS=$apr_save_CFLAGS
+ac_cv_getservbyname_r_style=osf1
 else
-  ac_cv_getservbyname_r_style=none
+  CFLAGS=$apr_save_CFLAGS
+ac_cv_getservbyname_r_style=none
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$apr_save_CFLAGS
 
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_getservbyname_r_style" >&5
 $as_echo "$ac_cv_getservbyname_r_style" >&6; }
 
 if test "$ac_cv_getservbyname_r_style" = "glibc2"; then
 
 $as_echo "#define GETSERVBYNAME_R_GLIBC2 1" >>confdefs.h
 
 elif test "$ac_cv_getservbyname_r_style" = "solaris"; then
 
 $as_echo "#define GETSERVBYNAME_R_SOLARIS 1" >>confdefs.h
 
 elif test "$ac_cv_getservbyname_r_style" = "osf1"; then
 
 $as_echo "#define GETSERVBYNAME_R_OSF1 1" >>confdefs.h
 
 fi
 
 fi
 
 
   { $as_echo "$as_me:${as_lineno-$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 ${ac_cv_tcp_nodelay_inherited+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then :
 
     ac_cv_tcp_nodelay_inherited="yes"
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_tcp_nodelay_inherited="yes"
 
 else
 
     ac_cv_tcp_nodelay_inherited="no"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$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 ${ac_cv_o_nonblock_inherited+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then :
 
     ac_cv_o_nonblock_inherited="yes"
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.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;
     fd_set fds;
     struct timeval tv;
 
     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;
     /* 1 second select timeout */
     tv.tv_sec = 1;
     tv.tv_usec = 0;
     /* Set up fd set */
     FD_ZERO(&fds);
     FD_SET(listen_s, &fds);
     /* Wait for socket to become readable */
     rc = select(listen_s + 1, &fds, NULL, NULL, &tv);
     if (rc < 0) {
         perror("select");
         exit(1);
     }
     if (rc == 0) {
         fprintf(stderr, "Socket failed to become readable (timeout)\n");
         exit(1);
     }
     if (!FD_ISSET(listen_s, &fds)) {
         fprintf(stderr, "Socket failed to become readable (selected another fd)\n");
         exit(1);
     }
     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
 if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_o_nonblock_inherited="yes"
 
 else
 
     ac_cv_o_nonblock_inherited="no"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether TCP_NODELAY and TCP_CORK can both be enabled" >&5
 $as_echo_n "checking whether TCP_NODELAY and TCP_CORK can both be enabled... " >&6; }
 if ${apr_cv_tcp_nodelay_with_cork+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
 See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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_TCP_H
 #include <netinet/tcp.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 
 int
 main ()
 {
 
     int fd, flag, rc;
 
     fd = socket(AF_INET, SOCK_STREAM, 0);
     if (fd < 0) {
        exit(1);
     }
 
     flag = 1;
     rc = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof flag);
     if (rc < 0) {
         perror("setsockopt TCP_NODELAY");
         exit(2);
     }
 
     flag = 1;
     rc = setsockopt(fd, IPPROTO_TCP, TCP_CORK, &flag, sizeof flag);
     if (rc < 0) {
         perror("setsockopt TCP_CORK");
         exit(3);
     }
 
     exit(0);
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_tcp_nodelay_with_cork=yes
 else
   apr_cv_tcp_nodelay_with_cork=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_tcp_nodelay_with_cork" >&5
 $as_echo "$apr_cv_tcp_nodelay_with_cork" >&6; }
 
 if test "$apr_cv_tcp_nodelay_with_cork" = "yes"; then
 
 $as_echo "#define HAVE_TCP_NODELAY_WITH_CORK 1" >>confdefs.h
 
 fi
 
 
 # Look for a way of corking TCP...
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_CORK in netinet/tcp.h" >&5
 $as_echo_n "checking for TCP_CORK in netinet/tcp.h... " >&6; }
 if ${ac_cv_define_TCP_CORK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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
 
 $as_echo "#define HAVE_TCP_CORK 1" >>confdefs.h
 
   fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_NOPUSH in netinet/tcp.h" >&5
 $as_echo_n "checking for TCP_NOPUSH in netinet/tcp.h... " >&6; }
 if ${ac_cv_define_TCP_NOPUSH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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
 
 $as_echo "#define HAVE_TCP_NOPUSH 1" >>confdefs.h
 
   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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$LINENO}: checking for SO_ACCEPTFILTER in sys/socket.h" >&5
 $as_echo_n "checking for SO_ACCEPTFILTER in sys/socket.h... " >&6; }
 if ${ac_cv_define_SO_ACCEPTFILTER+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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:${as_lineno-$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
 
 $as_echo "#define HAVE_SO_ACCEPTFILTER 1" >>confdefs.h
 
   fi
 
 if test "x$ac_cv_define_SO_ACCEPTFILTER" = "xyes"; then
     acceptfilter="1"
 else
     acceptfilter="0"
 fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether SCTP is supported" >&5
 $as_echo_n "checking whether SCTP is supported... " >&6; }
 if ${apr_cv_sctp+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then :
   apr_cv_sctp=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_sctp=yes
 else
   apr_cv_sctp=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct ip_mreq" >&5
 $as_echo_n "checking for struct ip_mreq... " >&6; }
 if ${apr_cv_struct_ipmreq+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
 #include <netinet/in.h>
 
 int
 main ()
 {
 
     struct ip_mreq mip;
     mip.imr_interface.s_addr = INADDR_ANY;
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   apr_cv_struct_ipmreq=yes
 else
   apr_cv_struct_ipmreq=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_struct_ipmreq" >&5
 $as_echo "$apr_cv_struct_ipmreq" >&6; }
 
 if test $apr_cv_struct_ipmreq = yes; then
 
 $as_echo "#define HAVE_STRUCT_IPMREQ 1" >>confdefs.h
 
 fi
 
 
 
 
 
 
 
 for ac_func in set_h_errno
 do :
   ac_fn_c_check_func "$LINENO" "set_h_errno" "ac_cv_func_set_h_errno"
 if test "x$ac_cv_func_set_h_errno" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SET_H_ERRNO 1
 _ACEOF
 
 fi
 done
 
 
 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:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
 $as_echo_n "checking for library containing getaddrinfo... " >&6; }
 if ${ac_cv_search_getaddrinfo+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_getaddrinfo=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_getaddrinfo+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_getaddrinfo+:} false; then :
 
 else
   ac_cv_search_getaddrinfo=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for library containing gai_strerror" >&5
 $as_echo_n "checking for library containing gai_strerror... " >&6; }
 if ${ac_cv_search_gai_strerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_gai_strerror=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_gai_strerror+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_gai_strerror+:} false; then :
 
 else
   ac_cv_search_gai_strerror=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: checking for library containing getnameinfo" >&5
 $as_echo_n "checking for library containing getnameinfo... " >&6; }
 if ${ac_cv_search_getnameinfo+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_getnameinfo=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_getnameinfo+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_getnameinfo+:} false; then :
 
 else
   ac_cv_search_getnameinfo=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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
+for ac_func in gai_strerror if_nametoindex if_indextoname
 do :
-  ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
-if test "x$ac_cv_func_gai_strerror" = xyes; then :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_GAI_STRERROR 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getaddrinfo" >&5
 $as_echo_n "checking for working getaddrinfo... " >&6; }
 if ${ac_cv_working_getaddrinfo+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then :
 
   ac_cv_working_getaddrinfo="yes"
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 
 int 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
 if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_working_getaddrinfo="yes"
 
 else
 
   ac_cv_working_getaddrinfo="no"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
 
   fi
 fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for negative error codes for getaddrinfo" >&5
 $as_echo_n "checking for negative error codes for getaddrinfo... " >&6; }
 if ${ac_cv_negative_eai+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then :
 
   ac_cv_negative_eai="no"
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 
 int main(void) {
     if (EAI_ADDRFAMILY < 0) {
         exit(0);
     }
     exit(1);
 }
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_negative_eai="yes"
 
 else
 
   ac_cv_negative_eai="no"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_negative_eai" >&5
 $as_echo "$ac_cv_negative_eai" >&6; }
 if test "$ac_cv_negative_eai" = "yes"; then
 
 $as_echo "#define NEGATIVE_EAI 1" >>confdefs.h
 
 fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getnameinfo" >&5
 $as_echo_n "checking for working getnameinfo... " >&6; }
 if ${ac_cv_working_getnameinfo+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then :
 
   ac_cv_working_getnameinfo="yes"
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 
 int 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
 if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_working_getnameinfo="yes"
 
 else
 
   ac_cv_working_getnameinfo="no"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_getnameinfo" >&5
 $as_echo "$ac_cv_working_getnameinfo" >&6; }
 if test "$ac_cv_working_getnameinfo" = "yes"; then
 
 $as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h
 
 fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_in6" >&5
 $as_echo_n "checking for sockaddr_in6... " >&6; }
 if ${ac_cv_define_sockaddr_in6+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 if ac_fn_c_try_compile "$LINENO"; then :
 
     ac_cv_define_sockaddr_in6=yes
 
 else
 
     ac_cv_define_sockaddr_in6=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 { $as_echo "$as_me:${as_lineno-$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
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage" >&5
 $as_echo_n "checking for sockaddr_storage... " >&6; }
 if ${apr_cv_define_sockaddr_storage+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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_storage sa;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   apr_cv_define_sockaddr_storage=yes
 else
   apr_cv_define_sockaddr_storage=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_define_sockaddr_storage" >&5
 $as_echo "$apr_cv_define_sockaddr_storage" >&6; }
 
 if test "$apr_cv_define_sockaddr_storage" = "yes"; then
   have_sa_storage=1
 else
   have_sa_storage=0
 fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_un" >&5
+$as_echo_n "checking for sockaddr_un... " >&6; }
+if ${ac_cv_define_sockaddr_un+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
+int
+main ()
+{
+
+struct sockaddr_un sa;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+    ac_cv_define_sockaddr_un=yes
+
+else
+
+    ac_cv_define_sockaddr_un=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_define_sockaddr_un" >&5
+$as_echo "$ac_cv_define_sockaddr_un" >&6; }
+
+if test "$ac_cv_define_sockaddr_un" = "yes"; then
+  have_sockaddr_un=1
+else
+  have_sockaddr_un=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
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working AI_ADDRCONFIG" >&5
 $as_echo_n "checking for working AI_ADDRCONFIG... " >&6; }
 if ${apr_cv_gai_addrconfig+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then :
   apr_cv_gai_addrconfig=no
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
 
 int main(int argc, char **argv) {
     struct addrinfo hints, *ai;
 
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_flags = AI_ADDRCONFIG;
     return getaddrinfo("localhost", NULL, &hints, &ai) != 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
   apr_cv_gai_addrconfig=yes
 else
   apr_cv_gai_addrconfig=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_gai_addrconfig" >&5
 $as_echo "$apr_cv_gai_addrconfig" >&6; }
 
 if test $apr_cv_gai_addrconfig = yes; then
 
 $as_echo "#define HAVE_GAI_ADDRCONFIG 1" >>confdefs.h
 
 fi
 
                     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:${as_lineno-$LINENO}: checking if APR supports IPv6" >&5
 $as_echo_n "checking if APR supports IPv6... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_result" >&5
 $as_echo "$ipv6_result" >&6; }
 
 
 
+# Check whether --enable-timedlocks was given.
+if test "${enable_timedlocks+set}" = set; then :
+  enableval=$enable_timedlocks; apr_has_timedlocks="0"
+else
+  apr_has_timedlocks="1"
+
+fi
+
+
+
 # hstrerror is only needed if IPv6 is not enabled,
 # so getaddrinfo/gai_strerror are not used.
 if test $have_ipv6 = 0; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing hstrerror" >&5
 $as_echo_n "checking for library containing hstrerror... " >&6; }
 if ${ac_cv_search_hstrerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 hstrerror ();
 int
 main ()
 {
 return hstrerror ();
   ;
   return 0;
 }
 _ACEOF
 for ac_lib in '' resolv; 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
   if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_hstrerror=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
   if ${ac_cv_search_hstrerror+:} false; then :
   break
 fi
 done
 if ${ac_cv_search_hstrerror+:} false; then :
 
 else
   ac_cv_search_hstrerror=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_hstrerror" >&5
 $as_echo "$ac_cv_search_hstrerror" >&6; }
 ac_res=$ac_cv_search_hstrerror
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 $as_echo "#define HAVE_HSTRERROR 1" >>confdefs.h
 
 fi
 
 fi
 
 
 for ac_header in langinfo.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default"
 if test "x$ac_cv_header_langinfo_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LANGINFO_H 1
 _ACEOF
 
 fi
 
 done
 
 for ac_func in nl_langinfo
 do :
   ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
 if test "x$ac_cv_func_nl_langinfo" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NL_LANGINFO 1
 _ACEOF
 
 fi
 done
 
 
 
 
   if test -z "$have_unicode_fs"; then
     test "x$silent" != "xyes" && echo "  setting have_unicode_fs to \"0\""
     have_unicode_fs="0"
   fi
 
 
 
 
   if test -z "$apr_has_xthread_files"; then
     test "x$silent" != "xyes" && echo "  setting apr_has_xthread_files to \"0\""
     apr_has_xthread_files="0"
   fi
 
 
 
 
   if test -z "$apr_procattr_user_set_requires_password"; then
     test "x$silent" != "xyes" && echo "  setting apr_procattr_user_set_requires_password to \"0\""
     apr_procattr_user_set_requires_password="0"
   fi
 
 
 
 
   if test -z "$apr_thread_func"; then
     test "x$silent" != "xyes" && echo "  setting apr_thread_func to \"\""
     apr_thread_func=""
   fi
 
 
 
 
   if test -z "$apr_has_user"; then
     test "x$silent" != "xyes" && echo "  setting apr_has_user to \"1\""
     apr_has_user="1"
   fi
 
 
 
 
 echo "${nl}Restore user-defined environment settings..."
 
 
 set X $apr_ste_save_CPPFLAGS
 if test ${#} -eq 1; 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
 if test "x$silent" != "xyes"; then
   echo "  restoring CPPFLAGS to \"$CPPFLAGS\""
   echo "  setting EXTRA_CPPFLAGS to \"$EXTRA_CPPFLAGS\""
 fi
 
 
 
 set X $apr_ste_save_CFLAGS
 if test ${#} -eq 1; 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
 if test "x$silent" != "xyes"; then
   echo "  restoring CFLAGS to \"$CFLAGS\""
   echo "  setting EXTRA_CFLAGS to \"$EXTRA_CFLAGS\""
 fi
 
 
 
 set X $apr_ste_save_LDFLAGS
 if test ${#} -eq 1; 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
 if test "x$silent" != "xyes"; then
   echo "  restoring LDFLAGS to \"$LDFLAGS\""
   echo "  setting EXTRA_LDFLAGS to \"$EXTRA_LDFLAGS\""
 fi
 
 
 
 set X $apr_ste_save_LIBS
 if test ${#} -eq 1; 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
 if test "x$silent" != "xyes"; then
   echo "  restoring LIBS to \"$LIBS\""
   echo "  setting EXTRA_LIBS to \"$EXTRA_LIBS\""
 fi
 
 
 
 set X $apr_ste_save_INCLUDES
 if test ${#} -eq 1; 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
 if test "x$silent" != "xyes"; then
   echo "  restoring INCLUDES to \"$INCLUDES\""
   echo "  setting EXTRA_INCLUDES to \"$EXTRA_INCLUDES\""
 fi
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 # Use -no-install or -no-fast-install to link the test
 # programs on all platforms but Darwin, where it would cause
 # the programs to be linked against installed versions of
 # libapr instead of those just built.
 case $host in
     *-apple-darwin*)
         LT_NO_INSTALL=""
         ;;
     *-mingw*)
         LT_NO_INSTALL="-no-fast-install"
         ;;
     *)
         LT_NO_INSTALL="-no-install"
         ;;
 esac
 
 
 #
 # 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"
 	INCLUDE_OUTPUTS="include $apr_srcdir/build-outputs.mk"
     else
 	# BSDi make
 	INCLUDE_RULES=".include \"$apr_buildout/apr_rules.mk\""
 	INCLUDE_OUTPUTS=".include \"$apr_srcdir/build-outputs.mk\""
     fi
     ;;
 *)
     INCLUDE_RULES="include $apr_buildout/apr_rules.mk"
     INCLUDE_OUTPUTS="include $apr_srcdir/build-outputs.mk"
     ;;
 esac
 
 
 
 ac_config_files="$ac_config_files Makefile include/apr.h build/apr_rules.mk build/pkg/pkginfo apr-$APR_MAJOR_VERSION-config:apr-config.in apr.pc"
 
 
 if test -d $srcdir/test; then
    ac_config_files="$ac_config_files test/Makefile test/internal/Makefile"
 
 fi
 
 dir=include/arch/unix
 test -d $dir || $MKDIR $dir
 
 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:${as_lineno-$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= ;; #(
       *) { eval $ac_var=; 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
     if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
         case $cache_file in #(
         */* | ?:*)
 	  mv -f confcache "$cache_file"$$ &&
 	  mv -f "$cache_file"$$ "$cache_file" ;; #(
         *)
 	  mv -f confcache "$cache_file" ;;
 	esac
       fi
     fi
   else
     { $as_echo "$as_me:${as_lineno-$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=
 U=
 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.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
   as_fn_append 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:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_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}
 export SHELL
 _ASEOF
 cat >>$CONFIG_STATUS <<\_ASEOF || as_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
 
 
 as_nl='
 '
 export as_nl
 # Printing a long string crashes Solaris 7 /usr/bin/printf.
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 # Prefer a ksh shell builtin over an external printf program on Solaris,
 # but without wasting forks for bash or zsh.
 if test -z "$BASH_VERSION$ZSH_VERSION" \
     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='print -r --'
   as_echo_n='print -rn --'
 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
   if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
     as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
     as_echo_n='/usr/ucb/echo -n'
   else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
       case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
       esac;
       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
     '
     export as_echo_n_body
     as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
   export as_echo_body
   as_echo='sh -c $as_echo_body as_echo'
 fi
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
       PATH_SEPARATOR=';'
   }
 fi
 
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
      ;;
 esac
 # We did not find ourselves, most probably we were run as `sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
 # Unset variables that we do not need and which cause bugs (e.g. in
 # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
 # suppresses any "Segmentation fault" message there.  '((' could
 # trigger a bug in pdksh 5.2.14.
 for as_var in BASH_ENV ENV MAIL MAILPATH
 do eval test x\${$as_var+set} = xset \
   && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
 LC_ALL=C
 export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
 # script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
   $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
 as_fn_set_status ()
 {
   return $1
 } # as_fn_set_status
 
 # as_fn_exit STATUS
 # -----------------
 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
 as_fn_exit ()
 {
   set +e
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
 
 # as_fn_unset VAR
 # ---------------
 # Portably unset VAR.
 as_fn_unset ()
 {
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
 else
   as_fn_append ()
   {
     eval $1=\$$1\$2
   }
 fi # as_fn_append
 
 # as_fn_arith ARG...
 # ------------------
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
 else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
 
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
   as_dirname=dirname
 else
   as_dirname=false
 fi
 
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
 
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
   case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
   xy)  ECHO_C='\c';;
   *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
        ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
   mkdir conf$$.dir 2>/dev/null
 fi
 if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
     as_ln_s='cp -pR'
   fi
 else
   as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 
 # as_fn_mkdir_p
 # -------------
 # Create "$as_dir" as a directory, including parents if necessary.
 as_fn_mkdir_p ()
 {
 
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
   test -d "$as_dir" || eval $as_mkdir_p || {
     as_dirs=
     while :; do
       case $as_dir in #(
       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
       as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 
 # as_fn_executable_p FILE
 # -----------------------
 # Test if FILE is an executable regular file.
 as_fn_executable_p ()
 {
   test -f "$1" && test -x "$1"
 } # as_fn_executable_p
 as_test_x='test -x'
 as_executable_p=as_fn_executable_p
 
 # 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
 ## ----------------------------------- ##
 ## Main body of $CONFIG_STATUS script. ##
 ## ----------------------------------- ##
 _ASEOF
 test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.69.  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 and other configuration actions
 from templates according to the current configuration.  Unless the files
 and actions are specified as TAGs, all are instantiated by default.
 
 Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
       --config     print configuration, 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 the package provider."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2012 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=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=
     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 ;;
   --config | --confi | --conf | --con | --co | --c )
     $as_echo "$ac_cs_config"; 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"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append 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
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --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_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append 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
 #
 # INIT-COMMANDS
 #
 
 
 # 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
 
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
 AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
 PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
 build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
 build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
 build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
 SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
 Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
 GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
 EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
 FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
 LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
 NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
 LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
 max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
 ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
 exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
 file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
 want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
 archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
 old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
 old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
 lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
 CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
 CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
 compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
 GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
 nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
 lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
 MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
 OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
 OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
 libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
 shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
 extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
 archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
 enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
 export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
 whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
 compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
 old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
 old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
 archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
 archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
 module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
 module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
 with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
 hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
 hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
 postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
 need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
 version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
 runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
 shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
 shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
 libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
 library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
 soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
 install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
 postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
 postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
 finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
 finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
 hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
 sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
 hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
 enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
 enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
 enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
 old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
 striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
 # A function that is used when there is no print builtin or printf.
 func_fallback_echo ()
 {
   eval 'cat <<_LTECHO_EOF
 \$1
 _LTECHO_EOF'
 }
 
 # Quote evaled strings.
 for var in AS \
 DLLTOOL \
 OBJDUMP \
 SHELL \
 ECHO \
 PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
 FGREP \
 LD \
 NM \
 LN_S \
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
 deplibs_check_method \
 file_magic_cmd \
 file_magic_glob \
 want_nocaseglob \
 sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
 archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
 CFLAGS \
 compiler \
 lt_cv_sys_global_symbol_pipe \
 lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
 nm_file_list_spec \
+lt_cv_truncate_bin \
 lt_prog_compiler_no_builtin_flag \
 lt_prog_compiler_pic \
 lt_prog_compiler_wl \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
 MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
 OTOOL \
 OTOOL64 \
 shrext_cmds \
 export_dynamic_flag_spec \
 whole_archive_flag_spec \
 compiler_needs_object \
 with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
 variables_saved_for_relink \
 libname_spec \
 library_names_spec \
 soname_spec \
 install_override_mode \
 finish_eval \
 old_striplib \
 striplib; do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
       ;;
     esac
 done
 
 # Double-quote double-evaled strings.
 for var in reload_cmds \
 old_postinstall_cmds \
 old_postuninstall_cmds \
 old_archive_cmds \
 extract_expsyms_cmds \
 old_archive_from_new_cmds \
 old_archive_from_expsyms_cmds \
 archive_cmds \
 archive_expsym_cmds \
 module_cmds \
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
 postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
       ;;
     esac
 done
 
 ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
 
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
     RM='$RM'
     ofile='$ofile'
 
 
 
 
 
 # Commands run at the beginning of config.status:
 APR_SAVE_HEADERS="include/apr.h include/arch/unix/apr_private.h"
 APR_MAJOR_VERSION=$APR_MAJOR_VERSION
 APR_PLATFORM=$host
 
 for apri in \${APR_SAVE_HEADERS}; do
   test -r \${apri} && mv \${apri} \${apri}.save
 done
 
 
 _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" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "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-$APR_MAJOR_VERSION-config") CONFIG_FILES="$CONFIG_FILES apr-$APR_MAJOR_VERSION-config:apr-config.in" ;;
     "apr.pc") CONFIG_FILES="$CONFIG_FILES apr.pc" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "test/internal/Makefile") CONFIG_FILES="$CONFIG_FILES test/internal/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   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= ac_tmp=
   trap 'exit_status=$?
   : "${ac_tmp:=$tmp}"
   { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
   test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 ac_tmp=$tmp
 
 # 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=`echo X | tr X '\015'`
 # On cygwin, bash can eat \r inside `` if the user requested igncr.
 # But we know of no other shell where ac_cr would be empty at this
 # point, so we can use a bashism as a fallback.
 if test "x$ac_cr" = x; then
   eval ac_cr=\$\'\\r\'
 fi
 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 {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
 {
   echo "cat >conf$$subs.awk <<_ACEOF" &&
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 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_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   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_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   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 >>"\$ac_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 >>"\$ac_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 < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
 # ${srcdir} and @srcdir@ entries 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[	 ]*=[	 ]*/{
 h
 s///
 s/^/:/
 s/[	 ]*$/:/
 s/:\$(srcdir):/:/g
 s/:\${srcdir}:/:/g
 s/:@srcdir@:/:/g
 s/^:*//
 s/:*$//
 x
 s/\(=[	 ]*\).*/\1/
 G
 s/\n//
 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 >"$ac_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_tt=`sed -n "/$ac_delim/p" confdefs.h`
   if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   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_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 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_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[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="$ac_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_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append 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:${as_lineno-$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 >"$ac_tmp/stdin" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     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"; as_fn_mkdir_p
   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:${as_lineno-$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 "$ac_tmp/subs.awk" \
   >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$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 "$ac_tmp/stdin"
   case $ac_file in
   -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
   *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
   :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
 
   case $ac_file$ac_mode in
     "libtool":C)
 
-    # See if we are running on zsh, and set the options which allow our
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    cfgfile=${ofile}T
     trap "$RM \"$cfgfile\"; exit 1" 1 2 15
     $RM "$cfgfile"
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 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.
+
+# GNU Libtool 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 of the License, or
+# (at your option) any later version.
 #
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
 #
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # The names of the tagged configurations supported by this script.
-available_tags=""
+available_tags=''
 
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
 # ### BEGIN LIBTOOL CONFIG
 
 # Assembler program.
 AS=$lt_AS
 
 # DLL creation program.
 DLLTOOL=$lt_DLLTOOL
 
 # Object dumper program.
 OBJDUMP=$lt_OBJDUMP
 
 # Which release of libtool.m4 was used?
 macro_version=$macro_version
 macro_revision=$macro_revision
 
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
 # Whether or not to build static libraries.
 build_old_libs=$enable_static
 
 # What type of objects to build.
 pic_mode=$pic_mode
 
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
 # Shell to use when invoking shell scripts.
 SHELL=$lt_SHELL
 
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
 # The PATH separator for the build system.
 PATH_SEPARATOR=$lt_PATH_SEPARATOR
 
 # 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
 
 # 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//"
 
 # A grep program that handles long lines.
 GREP=$lt_GREP
 
 # An ERE matcher.
 EGREP=$lt_EGREP
 
 # A literal string matcher.
 FGREP=$lt_FGREP
 
 # A BSD- or MS-compatible name lister.
 NM=$lt_NM
 
 # Whether we need soft or hard links.
 LN_S=$lt_LN_S
 
 # What is the maximum length of a command?
 max_cmd_len=$max_cmd_len
 
 # Object file suffix (normally "o").
 objext=$ac_objext
 
 # Executable file suffix (normally "").
 exeext=$exeext
 
 # whether the shell understands "unset".
 lt_unset=$lt_unset
 
 # turn spaces into newlines.
 SP2NL=$lt_lt_SP2NL
 
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
 # convert \$build file names to \$host format.
 to_host_file_cmd=$lt_cv_to_host_file_cmd
 
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
 # 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
 
 # How to find potential files when deplibs_check_method = "file_magic".
 file_magic_glob=$lt_file_magic_glob
 
 # Find potential files using nocaseglob when deplibs_check_method = "file_magic".
 want_nocaseglob=$lt_want_nocaseglob
 
 # Command to associate shared and link libraries.
 sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 
 # The archiver.
 AR=$lt_AR
 
 # Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
 # How to feed a file listing to the archiver.
 archiver_list_spec=$lt_archiver_list_spec
 
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
 # Commands used to install an old-style archive.
 RANLIB=$lt_RANLIB
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
 # Whether to use a lock for old archive extraction.
 lock_old_archive_extraction=$lock_old_archive_extraction
 
 # A C compiler.
 LTCC=$lt_CC
 
 # LTCC compiler flags.
 LTCFLAGS=$lt_CFLAGS
 
 # 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 into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
 # 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
 
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
 # Specify filename containing input files for \$NM.
 nm_file_list_spec=$lt_nm_file_list_spec
 
-# The root where to search for dependent libraries,and in which our libraries should be installed.
+# The root where to search for dependent libraries,and where our libraries should be installed.
 lt_sysroot=$lt_sysroot
 
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
 
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Manifest tool.
 MANIFEST_TOOL=$lt_MANIFEST_TOOL
 
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
 # Tool to change global to local symbols on Mac OS X.
 NMEDIT=$lt_NMEDIT
 
 # Tool to manipulate fat objects and archives on Mac OS X.
 LIPO=$lt_LIPO
 
 # ldd/readelf like tool for Mach-O binaries on Mac OS X.
 OTOOL=$lt_OTOOL
 
 # ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
 OTOOL64=$lt_OTOOL64
 
 # Old archive suffix (normally "a").
 libext=$libext
 
 # Shared library suffix (normally ".so").
 shrext_cmds=$lt_shrext_cmds
 
 # The commands to extract the exported symbol list from a shared archive.
 extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
 # Variables whose values should be saved in libtool wrapper scripts and
 # restored at link time.
 variables_saved_for_relink=$lt_variables_saved_for_relink
 
 # 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
 
 # Library versioning type.
 version_type=$version_type
 
 # Shared library runtime path variable.
 runpath_var=$runpath_var
 
 # Shared library path variable.
 shlibpath_var=$shlibpath_var
 
 # Is shlibpath searched before the hard-coded library search path?
 shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
 # 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
 
 # Permission mode override for installation of shared libraries.
 install_override_mode=$lt_install_override_mode
 
 # Command to use after installation of a shared archive.
 postinstall_cmds=$lt_postinstall_cmds
 
 # Command to use after uninstallation of a shared archive.
 postuninstall_cmds=$lt_postuninstall_cmds
 
 # Commands used to finish a libtool library installation in a directory.
 finish_cmds=$lt_finish_cmds
 
 # As "finish_cmds", except a single script fragment to be evaled but
 # not shown.
 finish_eval=$lt_finish_eval
 
 # Whether we should hardcode library paths into libraries.
 hardcode_into_libs=$hardcode_into_libs
 
 # 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
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
 
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
+
 # 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
 
 # Commands to strip libraries.
 old_striplib=$lt_old_striplib
 striplib=$lt_striplib
 
 
 # The linker used to build libraries.
 LD=$lt_LD
 
 # How to create reloadable object files.
 reload_flag=$lt_reload_flag
 reload_cmds=$lt_reload_cmds
 
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
 # A language specific compiler.
 CC=$lt_compiler
 
 # Is the compiler the GNU compiler?
 with_gcc=$GCC
 
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic
 
 # How to pass a linker flag through the compiler.
 wl=$lt_lt_prog_compiler_wl
 
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o
 
 # 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
 
 # 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
 
 # Whether the compiler copes with passing no objects directly.
 compiler_needs_object=$lt_compiler_needs_object
 
 # 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 a shared archive.
 archive_cmds=$lt_archive_cmds
 archive_expsym_cmds=$lt_archive_expsym_cmds
 
 # Commands used to build a loadable module if different from building
 # a shared archive.
 module_cmds=$lt_module_cmds
 module_expsym_cmds=$lt_module_expsym_cmds
 
 # Whether we are building with GNU ld or not.
 with_gnu_ld=$lt_with_gnu_ld
 
 # Flag that allows shared libraries with undefined symbols to be built.
 allow_undefined_flag=$lt_allow_undefined_flag
 
 # Flag that enforces no undefined symbols.
 no_undefined_flag=$lt_no_undefined_flag
 
 # 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
 
 # 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
+# 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 DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute
 
 # 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
 
 # Set to yes if linker adds runtime paths of dependent libraries
 # to runtime path list.
 inherit_rpath=$inherit_rpath
 
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
 # 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
 
 # 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
 
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
 # Commands necessary for finishing linking programs.
 postlink_cmds=$lt_postlink_cmds
 
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
 # How to hardcode a shared library path into an executable.
 hardcode_action=$hardcode_action
 
 # ### END LIBTOOL CONFIG
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
   case $host_os in
   aix3*)
     cat <<\_LT_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
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
 _LT_EOF
     ;;
   esac
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 
   # 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)
-
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
 
    mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
  ;;
     "default":C)
 # Commands run at the end of config.status:
 for i in $APR_SAVE_HEADERS; do
   if cmp -s $i $i.save 2>/dev/null; then
     mv $i.save $i
     { $as_echo "$as_me:${as_lineno-$LINENO}: $i is unchanged" >&5
 $as_echo "$as_me: $i is unchanged" >&6;}
   fi
   rm -f $i.save
 done
 chmod +x apr-$APR_MAJOR_VERSION-config
  ;;
 
   esac
 done # for ac_tag
 
 
 as_fn_exit 0
 _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # 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 || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
Index: head/contrib/apr/configure.in
===================================================================
--- head/contrib/apr/configure.in	(revision 361677)
+++ head/contrib/apr/configure.in	(revision 361678)
@@ -1,2864 +1,3020 @@
 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_PREREQ(2.59)
 
 AC_INIT(build/apr_common.m4)
 AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
 AC_CONFIG_AUX_DIR(build)
 AC_CONFIG_MACRO_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_win32.m4)
 sinclude(build/apr_hints.m4)
 sinclude(build/libtool.m4)
 sinclude(build/ltsugar.m4)
 sinclude(build/argz.m4)
 sinclude(build/ltoptions.m4)
 sinclude(build/ltversion.m4)
 sinclude(build/lt~obsolete.m4)
 
 dnl Hard-coded top of apr_private.h:
 AH_TOP([
 #ifndef APR_PRIVATE_H
 #define APR_PRIVATE_H
 ])
 
 dnl Hard-coded inclusion at the tail end of apr_private.h:
 AH_BOTTOM([
 /* switch this on if we have a BeOS version below BONE */
 #if defined(BEOS) && !defined(HAVE_BONE_VERSION)
 #define BEOS_R5 1
 #else
 #define BEOS_BONE 1
 #endif
 
 /*
  * Darwin 10's default compiler (gcc42) builds for both 64 and
  * 32 bit architectures unless specifically told not to.
  * In those cases, we need to override types depending on how
  * we're being built at compile time.
  * NOTE: This is an ugly work-around for Darwin's
  * concept of universal binaries, a single package
  * (executable, lib, etc...) which contains both 32
  * and 64 bit versions. The issue is that if APR is
  * built universally, if something else is compiled
  * against it, some bit sizes will depend on whether
  * it is 32 or 64 bit. This is determined by the __LP64__
  * flag. Since we need to support both, we have to
  * handle OS X unqiuely.
  */
 #ifdef DARWIN_10
 
 #undef APR_OFF_T_STRFN
 #undef APR_INT64_STRFN
 #undef SIZEOF_LONG
 #undef SIZEOF_SIZE_T
 #undef SIZEOF_SSIZE_T
 #undef SIZEOF_VOIDP
 #undef SIZEOF_STRUCT_IOVEC
 
 #ifdef __LP64__
  #define APR_INT64_STRFN strtol
  #define SIZEOF_LONG    8
  #define SIZEOF_SIZE_T  8
  #define SIZEOF_SSIZE_T 8
  #define SIZEOF_VOIDP   8
  #define SIZEOF_STRUCT_IOVEC 16
 #else
  #define APR_INT64_STRFN strtoll
  #define SIZEOF_LONG    4
  #define SIZEOF_SIZE_T  4
  #define SIZEOF_SSIZE_T 4
  #define SIZEOF_VOIDP   4
  #define SIZEOF_STRUCT_IOVEC 8
 #endif
 
 #undef APR_OFF_T_STRFN
 #define APR_OFF_T_STRFN APR_INT64_STRFN
  
 
 #undef SETPGRP_VOID
 #ifdef __DARWIN_UNIX03
  #define SETPGRP_VOID 1
 #else
 /* #undef SETPGRP_VOID */
 #endif
  
 #endif /* DARWIN_10 */
 
 /*
  * Include common private declarations.
  */
 #include "../apr_private_common.h"
 #endif /* APR_PRIVATE_H */
 ])
 
 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 AC_PROG_SED is only avaliable in recent autoconf versions.
 dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present.
 ifdef([AC_PROG_SED],
       [AC_PROG_SED],
       [AC_CHECK_PROG(SED, sed, sed)])
 
 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 random"
 
 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,[  --enable-experimental-libtool Use experimental custom libtool],
   [experimental_libtool=$enableval],[experimental_libtool=no])
 
 dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL
 if test "x$Xsed" = "x"; then
   Xsed="$SED -e 1s/^X//"
 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"
         $CC $CFLAGS $CPPFLAGS -o $LIBTOOL $LIBTOOL_SRC
         eval `$apr_builddir/libtool --config | grep "^shlibpath_var=[[A-Z_]]*$"`
         if test "x$shlibpath_var" = "x"; then
             shlibpath_var=REPLACE_WITH_YOUR_SHLIBPATH_VAR
         fi
     else
     dnl libtoolize requires that the following not be indented
     dnl should become LT_INIT(win32-dll)
 AC_LIBTOOL_WIN32_DLL
 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
+            eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool`
+        fi
+        if test "x$shlibpath_var" = "x"; then
+            AC_MSG_NOTICE([SHLIBPATH variable could not be determined])
             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-${APR_MAJOR_VERSION}" ] )
+AC_ARG_WITH(installbuilddir, [  --with-installbuilddir=DIR location to store APR build files],
+  [ installbuilddir=$withval ] )
 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) -o $@ -c $< && touch $@'
       LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
       link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(COMPILE) \$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
       so_ext='lo'
       lib_target='-rpath $(libdir) $(OBJECTS)'
       export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
 else
       lt_compile='$(COMPILE) -o $@ -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"
         ;;
     *-mingw* | *-cygwin*)
         LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
         ;;
     *)
         ;;
 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)
 AC_SUBST(LT_VERSION)
 
 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])
+      case `($CC --version) 2>/dev/null` in
+        *clang-900* | *"clang version 5.0.0"*)
+          APR_ADDTO(CFLAGS,[-Wno-error=strict-prototypes])
+          ;;
+      esac
    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
   ])
 
 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)
 	;;
     dnl If building static APR, both the APR build and the app build
     dnl need -DAPR_DECLARE_STATIC to generate the right linkage from    
     dnl APR_DECLARE et al.
     dnl If building dynamic APR, the APR build needs APR_DECLARE_EXPORT
     dnl and the app build should have neither define.
     *-mingw* | *-cygwin*)
         if test "$enable_shared" = "yes"; then
             APR_ADDTO(INTERNAL_CPPFLAGS, -DAPR_DECLARE_EXPORT)
         else
             APR_ADDTO(CPPFLAGS, -DAPR_DECLARE_STATIC)
         fi
         ;;
 esac
 
 AC_CACHE_CHECK([whether the compiler provides atomic builtins], [ap_cv_atomic_builtins],
 [AC_TRY_RUN([
 int main()
 {
     unsigned long val = 1010, tmp, *mem = &val;
 
     if (__sync_fetch_and_add(&val, 1010) != 1010 || val != 2020)
         return 1;
 
     tmp = val;
 
     if (__sync_fetch_and_sub(mem, 1010) != tmp || val != 1010)
         return 1;
 
     if (__sync_sub_and_fetch(&val, 1010) != 0 || val != 0)
         return 1;
 
     tmp = 3030;
 
     if (__sync_val_compare_and_swap(mem, 0, tmp) != 0 || val != tmp)
         return 1;
 
     if (__sync_lock_test_and_set(&val, 4040) != 3030)
         return 1;
 
     mem = &tmp;
 
     if (__sync_val_compare_and_swap(&mem, &tmp, &val) != &tmp)
         return 1;
 
     __sync_synchronize();
 
     if (mem != &val)
         return 1;
 
     return 0;
 }], [ap_cv_atomic_builtins=yes], [ap_cv_atomic_builtins=no], [ap_cv_atomic_builtins=no])])
 
 if test "$ap_cv_atomic_builtins" = "yes"; then
     AC_DEFINE(HAVE_ATOMIC_BUILTINS, 1, [Define if compiler provides atomic builtins])
 fi
 
 case $host in
     powerpc-405-*)
         # The IBM ppc405cr processor has a bugged stwcx instruction.
         AC_DEFINE(PPC405_ERRATA, 1, [Define on PowerPC 405 where errata 77 applies])
         ;;
     *)
         ;;
 esac
 
 dnl Check the depend program we can use
 APR_CHECK_DEPEND
 
 proc_mutex_is_global=0
 
 config_subdirs="none"
 INSTALL_SUBDIRS="none"
 OBJECTS_PLATFORM='$(OBJECTS_unix)'
 
 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"
        OBJECTS_PLATFORM='$(OBJECTS_aix)'
        ;;
    *-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
        OBJECTS_PLATFORM='$(OBJECTS_os2)'
        ;;
    *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
        OBJECTS_PLATFORM='$(OBJECTS_beos)'
        case $osver in
           5.0.4)
              file_as_socket="1"
              ;;
           *)
              file_as_socket="0"
              ;;
        esac
        ;;
+   *apple-darwin*)
+       ac_cv_func_fdatasync="no" # Mac OS X wrongly reports it has fdatasync()
+       OSDIR="unix"
+       eolstr="\\n"
+       ;;
    *os390)
        OSDIR="os390"
        OBJECTS_PLATFORM='$(OBJECTS_os390)'
        eolstr="\\n"
        ;;
    *os400)
        OSDIR="as400"
        eolstr="\\n"
        ;;
    *mingw*)
        OSDIR="win32"
        enable_threads="system_threads"
        eolstr="\\r\\n"
        file_as_socket=0
        proc_mutex_is_global=1
        OBJECTS_PLATFORM='$(OBJECTS_win32)'
        ;;
    *cygwin*)
        OSDIR="unix"
        enable_threads="no"
        eolstr="\\n"
        ;;
    *hpux10* ) 
        enable_threads="no"
        OSDIR="unix"
        eolstr="\\n"
        ;;
+   *darwin* ) 
+       ac_cv_func_fdatasync="no" # Mac OS X wrongly reports it has fdatasync()
+       OSDIR="unix"
+       eolstr="\\n"
+       ;;
    *)
        OSDIR="unix"
        eolstr="\\n"
        ;;
 esac
 
 AC_SUBST(OBJECTS_PLATFORM)
 
 # Check whether LFS has explicitly been disabled
 AC_ARG_ENABLE(lfs,[  --disable-lfs           Disable large file support on 32-bit platforms],
 [apr_lfs_choice=$enableval], [apr_lfs_choice=yes])
 
 if test "$apr_lfs_choice" = "yes"; then
    # Check whether the transitional LFS API is sufficient
    AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], [apr_cv_use_lfs64], [
    apr_save_CPPFLAGS=$CPPFLAGS
    CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
    AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 
 void main(void)
 {
     int fd, ret = 0;
     struct stat64 st;
     off64_t off = 4242;
 
     if (sizeof(off64_t) != 8 || sizeof(off_t) != 4)
        exit(1);
     if ((fd = open("conftest.lfs", O_LARGEFILE|O_CREAT|O_WRONLY, 0644)) < 0)
        exit(2);
     if (ftruncate64(fd, off) != 0)
        ret = 3;
     else if (fstat64(fd, &st) != 0 || st.st_size != off)
        ret = 4;
     else if (lseek64(fd, off, SEEK_SET) != off)
        ret = 5;
     else if (close(fd) != 0)
        ret = 6;
     else if (lstat64("conftest.lfs", &st) != 0 || st.st_size != off)
        ret = 7;
     else if (stat64("conftest.lfs", &st) != 0 || st.st_size != off)
        ret = 8;
     unlink("conftest.lfs");
 
     exit(ret);
 }], [apr_cv_use_lfs64=yes], [apr_cv_use_lfs64=no], [apr_cv_use_lfs64=no])
    CPPFLAGS=$apr_save_CPPFLAGS])
    if test "$apr_cv_use_lfs64" = "yes"; then
       APR_ADDTO(CPPFLAGS, [-D_LARGEFILE64_SOURCE])
    fi
 fi
 
 AC_ARG_ENABLE(nonportable-atomics,
 [  --enable-nonportable-atomics  Use optimized atomic code which may produce nonportable binaries],
 [if test $enableval = yes; then
    force_generic_atomics=no
  else
    force_generic_atomics=yes
  fi
 ],
 [case $host_cpu in
    i[[456]]86) force_generic_atomics=yes ;;
    *) force_generic_atomics=no
       case $host in
          *solaris2.10*)
             AC_TRY_COMPILE(
                 [#include <atomic.h>],
                 [void *ptr = NULL; atomic_cas_ptr(&ptr, NULL, NULL);],,
                 [force_generic_atomics=yes]
             )
             if test $force_generic_atomics = yes; then
                 AC_MSG_NOTICE([nonportable atomic support disabled, system needs Patch-ID 118884 or 118885])
             fi
             ;;
       esac
       ;;
 esac
 ])
 
 if test $force_generic_atomics = yes; then
    AC_DEFINE([USE_ATOMICS_GENERIC], 1,
              [Define if use of generic atomics is requested])
 fi
 
 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_major=[`uname -r | sed -e 's/\([1-9][0-9]*\)\..*/\1/'`]
         os_minor=[`uname -r | sed -e 's/[1-9][0-9]*\.\([0-9]\+\)\..*/\1/'`]
         if test $os_major -lt 2 -o \( $os_major -eq 2 -a $os_minor -lt 4 \); then
             AC_MSG_WARN([Configured for pre-2.4 Linux $os_major.$os_minor])
             os_pre24linux=1
         else
             os_pre24linux=0
             AC_MSG_NOTICE([Configured for Linux $os_major.$os_minor])
         fi
         ;;
     *os390)
         os_version=`uname -r | sed -e 's/\.//g'`
         ;;
     *)
         os_version=OS_VERSION_IS_NOT_SET
         ;;
 esac
 
 echo "${nl}Checking for libraries..."
 
 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.
 case $host in
    *mingw*)
       APR_ADDTO(LIBS,[-lshell32 -ladvapi32 -lws2_32 -lrpcrt4 -lmswsock])
       ac_cv_func_CreateFileMapping=yes
       ;;
    *)
       AC_SEARCH_LIBS(gethostbyname, nsl)
       AC_SEARCH_LIBS(gethostname, nsl)
       AC_SEARCH_LIBS(socket, socket)
       AC_SEARCH_LIBS(crypt, crypt ufc)
       AC_CHECK_LIB(truerand, main)
       AC_SEARCH_LIBS(modf, m)
        ;;
 esac
 
 dnl ----------------------------- Checking for Threads
 echo "${nl}Checking for Threads..."
 
 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" ], [
           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" ], [
           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
         APR_CHECK_PTHREAD_RECURSIVE_MUTEX
         AC_CHECK_FUNCS([pthread_key_delete pthread_rwlock_init \
                         pthread_attr_setguardsize pthread_yield])
 
         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
 
         if test "$ac_cv_func_pthread_yield" = "no"; then
             dnl ----------------------------- Checking for sched_yield
             AC_CHECK_HEADERS([sched.h])
             AC_CHECK_FUNCS([sched_yield])
         fi
     fi
 fi
 
-ac_cv_define_READDIR_IS_THREAD_SAFE=no
+ac_cv_define_READDIR_IS_THREAD_SAFE=yes
 ac_cv_define_GETHOSTBYNAME_IS_THREAD_SAFE=no
 ac_cv_define_GETHOSTBYADDR_IS_THREAD_SAFE=no
 ac_cv_define_GETSERVBYNAME_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]))
+    AC_DEFINE(READDIR_IS_THREAD_SAFE, 1, [Modern 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
     if test "x$apr_getservbyname_is_thread_safe" = "x"; then
         AC_CHECK_LIB(c_r, getservbyname, apr_getservbyname_is_thread_safe=yes)
     fi
     if test "$apr_getservbyname_is_thread_safe" = "yes"; then
         AC_DEFINE(GETSERVBYNAME_IS_THREAD_SAFE, 1, 
                   [Define if getservbyname is thread safe])
     fi
     AC_CHECK_FUNCS(gethostbyname_r gethostbyaddr_r getservbyname_r)
 else
     echo "APR will be non-threaded"
 fi
 
 dnl Electric Fence malloc checker.
 dnl --with-efence specifies the path to Electric Fence.
 dnl This test should remain after the threads checks since libefence
 dnl may depend on libpthread.
 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) ])
   ])
 
+AC_ARG_WITH(valgrind,
+  [  --with-valgrind[[=DIR]]   Enable code to teach valgrind about apr pools
+                          (optionally: set path to valgrind headers) ],
+  [ if test "$withval" != no; then
+      if test "$withval" = yes; then
+        withval=/usr/include/valgrind
+      fi
+      APR_ADDTO(CPPFLAGS, -I$withval)
+      AC_CHECK_HEADERS(valgrind.h memcheck.h)
+      APR_IFALLYES(header:valgrind.h header:memcheck.h,
+        [AC_DEFINE(HAVE_VALGRIND, 1, [Compile in valgrind support]) ],
+        [AC_MSG_ERROR(valgrind headers not found) ]
+      )
+    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 kqueue port_create)
 
 # Check for the Linux epoll interface; epoll* may be available in libc
 # but return ENOSYS on a pre-2.6 kernel, so do a run-time check.
 AC_CACHE_CHECK([for epoll support], [apr_cv_epoll],
 [AC_TRY_RUN([
 #include <sys/epoll.h>
 #include <unistd.h>
 
 int main()
 {
     return epoll_create(5) == -1;
 }], [apr_cv_epoll=yes], [apr_cv_epoll=no], [apr_cv_epoll=no])])
 
 if test "$apr_cv_epoll" = "yes"; then
    AC_DEFINE([HAVE_EPOLL], 1, [Define if the epoll interface is supported])
 fi
 
 dnl ----------------------------- Checking for extended file descriptor handling
 # test for epoll_create1
 AC_CACHE_CHECK([for epoll_create1 support], [apr_cv_epoll_create1],
 [AC_TRY_RUN([
 #include <sys/epoll.h>
 #include <unistd.h>
 
 int main()
 {
     return epoll_create1(0) == -1;
 }], [apr_cv_epoll_create1=yes], [apr_cv_epoll_create1=no], [apr_cv_epoll_create1=no])])
 
 if test "$apr_cv_epoll_create1" = "yes"; then
    AC_DEFINE([HAVE_EPOLL_CREATE1], 1, [Define if epoll_create1 function is supported])
 fi
 
 # test for dup3
 AC_CACHE_CHECK([for dup3 support], [apr_cv_dup3],
 [AC_TRY_RUN([
 #include <unistd.h>
 
 int main()
 {
     return dup3(STDOUT_FILENO, STDERR_FILENO, 0) == -1;
 }], [apr_cv_dup3=yes], [apr_cv_dup3=no], [apr_cv_dup3=no])])
 
 if test "$apr_cv_dup3" = "yes"; then
    AC_DEFINE([HAVE_DUP3], 1, [Define if dup3 function is supported])
 fi
 
 # Test for accept4().  Create a non-blocking socket, bind it to
 # an unspecified port & address (kernel picks), and attempt to
 # call accept4() on it.  If the syscall is wired up (i.e. the
 # kernel is new enough), it should return EAGAIN.
 AC_CACHE_CHECK([for accept4 support], [apr_cv_accept4],
 [AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 
 int main(int argc, char **argv)
 {
     int fd, flags;
     struct sockaddr_in sin;
 
     if ((fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
         return 1;
     flags = fcntl(fd, F_GETFL);
     if (flags == -1 || fcntl(fd, F_SETFL, flags|O_NONBLOCK) == -1)
         return 5;
 
     memset(&sin, 0, sizeof sin);
     sin.sin_family = AF_INET;
     
     if (bind(fd, (struct sockaddr *) &sin, sizeof sin) == -1)
         return 2;
     
     if (listen(fd, 5) == -1)
         return 3;
 
     if (accept4(fd, NULL, 0, SOCK_NONBLOCK) == 0
         || errno == EAGAIN || errno == EWOULDBLOCK)
         return 0;
 
     return 4;
 }], [apr_cv_accept4=yes], [apr_cv_accept4=no], [apr_cv_accept4=no])])
 
 if test "$apr_cv_accept4" = "yes"; then
    AC_DEFINE([HAVE_ACCEPT4], 1, [Define if accept4 function is supported])
 fi
 
 AC_CACHE_CHECK([for SOCK_CLOEXEC support], [apr_cv_sock_cloexec],
 [AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/socket.h>
 
 int main()
 {
     return socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0) == -1;
 }], [apr_cv_sock_cloexec=yes], [apr_cv_sock_cloexec=no], [apr_cv_sock_cloexec=no])])
 
 if test "$apr_cv_sock_cloexec" = "yes"; then
    AC_DEFINE([HAVE_SOCK_CLOEXEC], 1, [Define if the SOCK_CLOEXEC flag is supported])
 fi
 
 dnl ----------------------------- Checking for fdatasync: OS X doesn't have it
 AC_CHECK_FUNCS(fdatasync)
 
 dnl ----------------------------- Checking for extended file descriptor handling
 # test for epoll_create1
 AC_CACHE_CHECK([for epoll_create1 support], [apr_cv_epoll_create1],
 [AC_TRY_RUN([
 #include <sys/epoll.h>
 #include <unistd.h>
 
 int main()
 {
     return epoll_create1(0) == -1;
 }], [apr_cv_epoll_create1=yes], [apr_cv_epoll_create1=no], [apr_cv_epoll_create1=no])])
 
 if test "$apr_cv_epoll_create1" = "yes"; then
    AC_DEFINE([HAVE_EPOLL_CREATE1], 1, [Define if epoll_create1 function is supported])
 fi
 
 # Check for z/OS async i/o support.  
 AC_CACHE_CHECK([for asio -> message queue support], [apr_cv_aio_msgq],
 [AC_TRY_RUN([
 #define _AIO_OS390
 #include <aio.h>
 
 int main()
 {
     struct aiocb a;
 
     a.aio_notifytype = AIO_MSGQ;  /* use IPC message queue for notification */
 
     return aio_cancel(2, NULL) == -1;
 }], [apr_cv_aio_msgq=yes], [apr_cv_aio_msgq=no], [apr_cv_aio_msgq=no])])
 
 if test "$apr_cv_aio_msgq" = "yes"; then
    AC_DEFINE([HAVE_AIO_MSGQ], 1, [Define if async i/o supports message q's])
 fi
 
 # test for dup3
 AC_CACHE_CHECK([for dup3 support], [apr_cv_dup3],
 [AC_TRY_RUN([
 #include <unistd.h>
 
 int main()
 {
     return dup3(STDOUT_FILENO, STDERR_FILENO, 0) == -1;
 }], [apr_cv_dup3=yes], [apr_cv_dup3=no], [apr_cv_dup3=no])])
 
 if test "$apr_cv_dup3" = "yes"; then
    AC_DEFINE([HAVE_DUP3], 1, [Define if dup3 function is supported])
 fi
 
 # test for accept4
 AC_CACHE_CHECK([for accept4 support], [apr_cv_accept4],
 [AC_TRY_RUN([
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <errno.h>
 
 #define A4_SOCK "./apr_accept4_test_socket"
 
 int main()
 {
     pid_t pid;
     int fd;
     struct sockaddr_un loc, rem;
     socklen_t rem_sz;
 
     if ((pid = fork())) {
         int status;
 
         unlink(A4_SOCK);
 
         if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
             goto cleanup_failure2;
 
         loc.sun_family = AF_UNIX;
         strncpy(loc.sun_path, A4_SOCK, sizeof(loc.sun_path) - 1);
 
         if (bind(fd, (struct sockaddr *) &loc,
                  sizeof(struct sockaddr_un)) == -1)
             goto cleanup_failure;
 
         if (listen(fd, 5) == -1)
             goto cleanup_failure;
 
         rem_sz = sizeof(struct sockaddr_un);
         if (accept4(fd, (struct sockaddr *) &rem, &rem_sz, 0) == -1) {
             goto cleanup_failure;
         }
         else {
             close(fd);
             waitpid(pid, &status, 0);
             unlink(A4_SOCK);
             return 0;
         }
 
 cleanup_failure:
         close(fd);
 cleanup_failure2:
         kill(pid, SIGKILL);
         waitpid(pid, &status, 0);
         unlink(A4_SOCK);
         return 1;
     }
     else {
         if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
             return 1; /* this will be bad: we'll hang */
 
         loc.sun_family = AF_UNIX;
         strncpy(loc.sun_path, A4_SOCK, sizeof(loc.sun_path) - 1);
 
         while(connect(fd, (struct sockaddr *) &loc,
                       sizeof(struct sockaddr_un)) == -1 &&
               (errno==ENOENT || errno==ECONNREFUSED))
             ;
 
         close(fd);
         return 0;
     }
 }], [apr_cv_accept4=yes], [apr_cv_accept4=no], [apr_cv_accept4=no])])
 
 if test "$apr_cv_accept4" = "yes"; then
    AC_DEFINE([HAVE_ACCEPT4], 1, [Define if accept4 function is supported])
 fi
 
 AC_CACHE_CHECK([for SOCK_CLOEXEC support], [apr_cv_sock_cloexec],
 [AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/socket.h>
 
 int main()
 {
     return socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0) == -1;
 }], [apr_cv_sock_cloexec=yes], [apr_cv_sock_cloexec=no], [apr_cv_sock_cloexec=no])])
 
 if test "$apr_cv_sock_cloexec" = "yes"; then
    AC_DEFINE([HAVE_SOCK_CLOEXEC], 1, [Define if the SOCK_CLOEXEC flag is supported])
 fi
 
 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/types.h sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h windows.h])
+AC_CHECK_HEADERS([sys/types.h sys/mman.h sys/ipc.h sys/mutex.h \
+                  sys/shm.h sys/file.h sys/socket.h kernel/OS.h os2.h windows.h])
+AC_CHECK_HEADERS([net/if.h],[],[],
+[
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#include <net/if.h>
+])
 AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \
-                create_area])
+                create_area mprotect])
 
 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])])
 APR_IFALLYES(header:windows.h func:CreateFileMapping,
              [havewin32shm="1"
               APR_DECIDE(USE_SHMEM_WIN32_ANON,
                          [Windows CreateFileMapping()])])
 case $host in
     *linux* ) 
         # Linux has problems with MM_SHMT_MMANON even though it reports
         # 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_pre24linux -eq 1; then
             AC_MSG_WARN([Disabling anon mmap() support for Linux pre-2.4])
             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"
 havewin32shm="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()])])
 APR_IFALLYES(header:windows.h,
              [havewin32shm="1"
               APR_DECIDE(USE_SHMEM_WIN32, [Windows shared memory])])
 AC_ARG_ENABLE(posix-shm,
 [  --enable-posix-shm      Use POSIX shared memory (shm_open) if available],
 [
 if test "$havemmapshm" = "1"; then
   APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_SHM)
 fi
 ])
 case $host in
     *linux* ) 
         # Linux pre-2.4 had problems with MM_SHMT_MMANON even though
         # it reports that it has it.
         if test $os_pre24linux -eq 1; 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"
 usewin32shm="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"
         ;;
     USE_SHMEM_WIN32 )
         usewin32shm="1"
         ;;
 esac
 
 # Do we have any shared memory support?
 if test "$usemmaptmp$usemmapshm$usemmapzero$useshmget$usemmapanon$usebeosarea$useos2shm$usewin32shm" = "00000000"; then
   sharedmem="0"
 else
   sharedmem="1"
 fi
 
 AC_SUBST(usemmaptmp)
 AC_SUBST(usemmapshm)
 AC_SUBST(useshmget)
 AC_SUBST(usebeosarea)
 AC_SUBST(useos2shm)
 AC_SUBST(usewin32shm)
 AC_SUBST(havemmaptmp)
 AC_SUBST(havemmapshm)
 AC_SUBST(haveshmget)
 AC_SUBST(havebeosarea)
 AC_SUBST(haveos2shm)
 AC_SUBST(havewin32shm)
 AC_SUBST(sharedmem)
 
 dnl ----------------------------- Checks for Any required Functions
 dnl Checks for library functions. (N.B. poll is further down)
 
 AC_FUNC_ALLOCA
 
 AC_CHECK_FUNCS([calloc setsid isinf isnan \
                 getenv putenv setenv unsetenv \
                 writev getifaddrs utime utimes])
 AC_CHECK_FUNCS(setrlimit, [ have_setrlimit="1" ], [ have_setrlimit="0" ]) 
 AC_CHECK_FUNCS(getrlimit, [ have_getrlimit="1" ], [ have_getrlimit="0" ]) 
 sendfile="0"
 AC_CHECK_LIB(sendfile, sendfilev)
 AC_CHECK_FUNCS(sendfile send_file sendfilev, [ sendfile="1" ])
 
 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_pre24linux -eq 1; then
                 AC_MSG_WARN([Disabled sendfile support for Linux 2.2 on S/390])
                 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
             ;;
     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(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])
 case $host in
     *-hp-hpux*)
         dnl mkstemp is limited to 26 temporary files (a-z); use APR replacement
         ;;
     *)
         AC_CHECK_FUNCS(mkstemp)
         ;;
 esac
 
 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
 
 dnl ----------------------------- Checks for Any required Headers
 AC_HEADER_STDC
 
 APR_FLAG_HEADERS(
     ByteOrder.h		\
     conio.h		\
     crypt.h		\
     ctype.h		\
     dir.h		\
     dirent.h		\
     dl.h		\
     dlfcn.h		\
     errno.h		\
     fcntl.h		\
     grp.h		\
+    inttypes.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		\
     windows.h		\
     winsock2.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/param.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(inttypesh)
 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(processh)
 AC_SUBST(pthreadh)
 AC_SUBST(semaphoreh)
 AC_SUBST(windowsh)
 AC_SUBST(winsock2h)
 
 # 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
 
 AC_ARG_ENABLE(allocator-uses-mmap,
   [  --enable-allocator-uses-mmap    Use mmap in apr_allocator instead of malloc ],
   [ if test "$enableval" = "yes"; then
         APR_IFALLYES(header:sys/mman.h func:mmap func:munmap define:MAP_ANON,
                      [AC_DEFINE(APR_ALLOCATOR_USES_MMAP, 1,
                                 [Define if apr_allocator should use mmap]) ],
 		     [AC_MSG_ERROR([mmap()/MAP_ANON not supported]) ]
 		    )
     fi ]
 )
 
+AC_ARG_ENABLE(allocator-guard-pages,
+  [  --enable-allocator-guard-pages  Use guard pages in apr_allocator
+                                  (implies --enable-allocator-uses-mmap) ] ,
+  [ if test "$enableval" = "yes"; then
+        APR_IFALLYES(header:sys/mman.h func:mmap func:munmap func:mprotect define:MAP_ANON,
+                     [AC_DEFINE(APR_ALLOCATOR_GUARD_PAGES, 1,
+                                [Define if apr_allocator should use guard pages]) ],
+                     [AC_MSG_ERROR([mmap()/MAP_ANON/mprotect() not supported]) ]
+                   )
+    fi ]
+)
+
+
+AC_ARG_ENABLE(pool-concurrency-check,
+  [  --enable-pool-concurrency-check Check for concurrent usage of memory pools],
+  [ if test "$enableval" = "yes"; then
+    AC_DEFINE(APR_POOL_CONCURRENCY_CHECK, 1,
+               [Define if pool functions should abort if concurrent usage is detected])
+    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_FUNC_SETPGRP
 
 APR_CHECK_SOCKLEN_T
 
 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(short, 2)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(short, 2)
 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
+# The first match is our preference (use inttypes if available).
+APR_IFALLYES(header:stdint.h header:inttypes.h, hasinttypes="1", hasinttypes="0")
+if test "$hasinttypes" = "1"; then
+    int64_literal='#define APR_INT64_C(val) INT64_C(val)'
+    uint64_literal='#define APR_UINT64_C(val) UINT64_C(val)'
+    int64_t_fmt='#define APR_INT64_T_FMT PRId64'
+    uint64_t_fmt='#define APR_UINT64_T_FMT PRIu64'
+    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT PRIx64'
+    int64_value="int64_t"
+    uint64_value="uint64_t"
+    APR_CHECK_TYPES_FMT_COMPATIBLE(int64_t, int, d, [
+        int64_strfn="strtoi"
+    ], [
+    APR_CHECK_TYPES_FMT_COMPATIBLE(int64_t, long, ld, [
+        int64_strfn="strtol"
+    ], [
+    APR_CHECK_TYPES_FMT_COMPATIBLE(int64_t, long long, lld, [
+        int64_strfn="strtoll"
+    ], [
+        AC_ERROR([could not determine the string function for int64_t])
+    ])])])
+elif test "$ac_cv_sizeof_int" = "8"; then
     int64_literal='#define APR_INT64_C(val) (val)'
     uint64_literal='#define APR_UINT64_C(val) (val##U)'
     int64_t_fmt='#define APR_INT64_T_FMT "d"'
     uint64_t_fmt='#define APR_UINT64_T_FMT "u"'
     uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "x"'
     int64_value="int"
-    long_value=int
+    uint64_value="unsigned int"
     int64_strfn="strtoi"
 elif test "$ac_cv_sizeof_long" = "8"; then
     int64_literal='#define APR_INT64_C(val) (val##L)'
     uint64_literal='#define APR_UINT64_C(val) (val##UL)'
     int64_t_fmt='#define APR_INT64_T_FMT "ld"'
     uint64_t_fmt='#define APR_UINT64_T_FMT "lu"'
     uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "lx"'
     int64_value="long"
-    long_value=long
+    uint64_value="unsigned long"
     int64_strfn="strtol"
 elif test "$ac_cv_sizeof_long_long" = "8"; then
     int64_literal='#define APR_INT64_C(val) (val##LL)'
     uint64_literal='#define APR_UINT64_C(val) (val##ULL)'
     # 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"'
     uint64_t_fmt='#define APR_UINT64_T_FMT "llu"'
     uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "llx"'
     int64_value="long long"
-    long_value="long long"
+    uint64_value="unsigned long long"
     int64_strfn="strtoll"
 elif test "$ac_cv_sizeof_longlong" = "8"; then
     int64_literal='#define APR_INT64_C(val) (val##LL)'
     uint64_literal='#define APR_UINT64_C(val) (val##ULL)'
     int64_t_fmt='#define APR_INT64_T_FMT "qd"'
     uint64_t_fmt='#define APR_UINT64_T_FMT "qu"'
     uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "qx"'
     int64_value="__int64"
-    long_value="__int64"
+    uint64_value="unsigned __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.
     AC_ERROR([could not detect a 64-bit integer type])
 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)'
     uint64_literal='#define APR_UINT64_C(val) UINT64_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>], 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.
 case $host in
    s390*linux*)
        # uniquely, the 31-bit Linux/s390 uses "unsigned long int"
        # for size_t rather than "unsigned int":
        size_t_fmt="lu"
        ssize_t_fmt="ld"
        ;;
    *-os2*)
        size_t_fmt="lu"
        ;;
    *-solaris*)
        if test "$ac_cv_sizeof_long" = "8"; then
          pid_t_fmt='#define APR_PID_T_FMT "d"'
        else
          pid_t_fmt='#define APR_PID_T_FMT "ld"'
        fi
        ;;
    *aix4*|*aix5*)
        ssize_t_fmt="ld"
        size_t_fmt="lu"
        ;;
     *beos*)
         ssize_t_fmt="ld"
         size_t_fmt="ld"
         ;;
     *apple-darwin*)
         osver=`uname -r`
         case $osver in
            [[0-7]].*)
               ssize_t_fmt="d"
               ;;
            *)
               ssize_t_fmt="ld"
               ;;
         esac
         size_t_fmt="lu"
         ;;
     *-mingw*)
         int64_t_fmt='#define APR_INT64_T_FMT "I64d"'
         uint64_t_fmt='#define APR_UINT64_T_FMT "I64u"'
         uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "I64x"'
         int64_value="__int64"
-        long_value="__int64"
+        uint64_value="unsigned __int64"
         int64_strfn="_strtoi64"
         ;; 
 esac
 
-APR_CHECK_TYPES_COMPATIBLE(ssize_t, int, [ssize_t_fmt="d"])
-APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"])
-APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
-APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])
+dnl I would expect much of the above to go away with new compile test
+APR_CHECK_TYPES_FMT_COMPATIBLE(ssize_t, long, ld, [ssize_t_fmt="ld"], [
+APR_CHECK_TYPES_FMT_COMPATIBLE(ssize_t, int, d, [ssize_t_fmt="d"])
+])
+APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned long, lu, [size_t_fmt="lu"], [
+APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"])
+])
 
 APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
 
+dnl the else cases below should no longer occur;
 AC_MSG_CHECKING([which format to use for apr_ssize_t])
 if test -n "$ssize_t_fmt"; then
     AC_MSG_RESULT(%$ssize_t_fmt)
 elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
     ssize_t_fmt="d"
     AC_MSG_RESULT(%d)
 elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long"; then
     ssize_t_fmt="ld"
     AC_MSG_RESULT(%ld)
 else
     AC_ERROR([could not determine the proper format for apr_ssize_t])
 fi
 
 ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
 
 APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
 
+# else cases below should no longer occur;
 AC_MSG_CHECKING([which format to use for apr_size_t])
 if test -n "$size_t_fmt"; then
     AC_MSG_RESULT(%$size_t_fmt)
 elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then
     size_t_fmt="d"
     AC_MSG_RESULT(%d)
 elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long"; then
     size_t_fmt="ld"
     AC_MSG_RESULT(%ld)
 else
     AC_ERROR([could not determine the proper format for apr_size_t])
 fi
 
 size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
 
 APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
 
 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
     # Enable LFS
     aprlfs=1
     AC_CHECK_FUNCS([mmap64 sendfile64 sendfilev64 readdir64_r])
     case $host in
         *-hp-hpux*)
             dnl mkstemp64 is limited to 26 temporary files (a-z); use APR replacement
             ;;
         *)
             AC_CHECK_FUNCS(mkstemp64)
             ;;
     esac
 elif test "${ac_cv_sizeof_off_t}" != "${ac_cv_sizeof_size_t}"; then
     # unsure of using -gt above is as portable, can can't forsee where
     # off_t can legitimately be smaller than size_t
     aprlfs=1
 else
     aprlfs=0     
 fi
 
 AC_MSG_CHECKING([which type to use for apr_off_t])
 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
     # LFS is go!
     off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT'
     off_t_value='off64_t'
     off_t_strfn='apr_strtoi64'
 elif test "${ac_cv_sizeof_off_t}x${ac_cv_sizeof_long}" = "4x4"; 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"'
     off_t_strfn='strtol'
 elif test "$ac_cv_type_off_t" = "yes"; then
-    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"'
+    # where int and long are the same size and interchangable.
+    off_t_value=off_t
+    APR_CHECK_TYPES_FMT_COMPATIBLE(off_t, long, ld, [
+        off_t_fmt="#define APR_OFF_T_FMT \"ld\""
         off_t_strfn='strtol'
-    elif test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_int"; then
-        off_t_fmt='#define APR_OFF_T_FMT "d"'
+    ], [
+    APR_CHECK_TYPES_FMT_COMPATIBLE(off_t, int, d, [
+        off_t_fmt="#define APR_OFF_T_FMT \"d\""
         off_t_strfn='strtoi'
-    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'
-        off_t_strfn='apr_strtoi64'
-    else
-        AC_ERROR([could not determine the size of off_t])
-    fi
+    ], [
+    APR_CHECK_TYPES_FMT_COMPATIBLE(off_t, long long, lld, [
+        off_t_fmt="#define APR_OFF_T_FMT \"lld\""
+        off_t_strfn='strtoll'
+    ], [
+    APR_CHECK_TYPES_FMT_COMPATIBLE(off_t, $int64_value, I64d, [
+        off_t_fmt="#define APR_OFF_T_FMT APR_INT64_T_FMT"
+        off_t_strfn='apr_strtoi64'], [
     # Per OS tuning...
     case $host in
     *-mingw*)
         off_t_value=apr_int64_t
         off_t_fmt='#define APR_OFF_T_FMT "I64d"'
         off_t_strfn='_strtoi64'
         ;;
+    *)
+        AC_ERROR([could not determine the size of off_t])
+        ;;
     esac
+    ])])])])
 else
    # Fallback on int
    off_t_value=apr_int32_t
    off_t_fmt=d
    off_t_strfn='strtoi'
 fi
 AC_MSG_RESULT($off_t_value)
 
 # Regardless of whether _LARGEFILE64_SOURCE is used, on some
 # platforms _FILE_OFFSET_BITS will affect the size of ino_t and hence
 # the build-time ABI may be different from the apparent ABI when using
 # APR with another package which *does* define _FILE_OFFSET_BITS.
 # (Exactly as per the case above with off_t where LFS is *not* used)
 #
 # To be safe, hard-code apr_ino_t as 'unsigned long' or 'unsigned int'
 # iff that is exactly the size of ino_t here; otherwise use ino_t as existing
 # releases did.  To be correct, apr_ino_t should have been made an
 # ino64_t as apr_off_t is off64_t, but this can't be done now without
 # breaking ABI.
 
 # Per OS tuning...
 case $host in
 *mingw*)
     ino_t_value=apr_int64_t
     ;;
 *)
     ino_t_value=ino_t
     APR_CHECK_SIZEOF_EXTENDED(AC_INCLUDES_DEFAULT, ino_t, $ac_cv_sizeof_long)
     if test $ac_cv_sizeof_ino_t = 4; then
         if test $ac_cv_sizeof_long = 4; then
             ino_t_value="unsigned long"
         else
             ino_t_value="unsigned int"
         fi
     fi
     ;;
 esac
 AC_MSG_NOTICE([using $ino_t_value for ino_t])
 
 # Checks for endianness
 AC_C_BIGENDIAN
 if test $ac_cv_c_bigendian = yes; then
     bigendian=1
 else
     bigendian=0
 fi
 
 APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
 #include <sys/uio.h>],struct iovec,0)
 if test "$ac_cv_sizeof_struct_iovec" = "0"; then
     have_iovec=0
 else
     have_iovec=1
 fi
 
 AC_SUBST(voidp_size)
 AC_SUBST(short_value)
 AC_SUBST(int_value)
-AC_SUBST(long_value)
 AC_SUBST(int64_value)
+AC_SUBST(uint64_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(uint64_t_fmt) 
 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(uint64_literal) 
 AC_SUBST(stdint) 
 AC_SUBST(bigendian)
 AC_SUBST(aprlfs)
 AC_SUBST(have_iovec)
 AC_SUBST(ino_t_value)
 
 dnl ----------------------------- Checking for string functions
 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_FUNC($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_FUNC(strtoq, [have_int64_strfn=1], [have_int64_strfn=0])
 fi
 
 if test "$have_int64_strfn" = "1"; then
   AC_DEFINE_UNQUOTED(APR_INT64_STRFN, [$int64_strfn],
       [Define as function which can be used for conversion of strings to apr_int64_t])
 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)
 
 if test "$off_t_strfn" = "apr_strtoi64" && test "$have_int64_strfn" = "1"; then
     off_t_strfn=$int64_strfn
 fi
 AC_DEFINE_UNQUOTED(APR_OFF_T_STRFN, [$off_t_strfn],
           [Define as function used for conversion of strings to apr_off_t])
 
 dnl ----------------------------- Checking for DSO support
 echo "${nl}Checking for DSO..."
 AC_ARG_ENABLE(dso,
   [  --disable-dso           Disable DSO support ],
   [if test "x$enableval" = "xyes"; then
       dsotype=any
    else
       dsotype=$enableval
    fi
   ], [dsotype=any])
 
 if test "$dsotype" = "any"; then
     if test "$dsotype" = "any"; then
       case $host in
         *darwin[[0-8]]\.*) 
           # Original Darwin, not for 9.0!:
           AC_CHECK_FUNC(NSLinkModule, [dsotype=dyld]);;
         hppa*-hpux[[1-9]]\.*|hppa*-hpux1[[01]]*)
           # shl is specific to parisc hpux SOM binaries, not used for 64 bit
           AC_CHECK_LIB(dld, shl_load, [have_shl=1])
           if test "$ac_cv_sizeof_voidp$have_shl" = "41"; then
             dsotype=shl; APR_ADDTO(LIBS,-ldld)
           fi;;
         *mingw*|*-os2*)
           # several 'other's below probably belong up here.  If they always
           # use a platform implementation and shouldn't test the dlopen/dlfcn
           # features, then bring them up here.
           # But if they -should- optionally use dlfcn, and/or need the config
           # detection of dlopen/dlsym, do not move them up.
           dsotype=other ;;
       esac
     fi
     # Normal POSIX:
     if test "$dsotype" = "any"; then
       AC_CHECK_FUNC(dlopen, [dsotype=dlfcn])
     fi
     if test "$dsotype" = "any"; then
       AC_CHECK_LIB(dl, dlopen, [dsotype=dlfcn; APR_ADDTO(LIBS,-ldl)])
     fi
     if test "$dsotype" = "dlfcn"; then
         # ReliantUnix has dlopen() in libc but dlsym() in libdl :(
         AC_CHECK_FUNC(dlsym, [], 
           [AC_CHECK_LIB(dl, dlsym, 
              [APR_ADDTO(LIBS, -ldl)],
              [dsotype=any
               echo "Weird: dlopen() was found but dlsym() was not found!"])])
     fi
     if test "$dsotype" = "any"; then
       # BeOS:
       AC_CHECK_LIB(root, load_image, [dsotype=other])
     fi
     # Everything else:
     if test "$dsotype" = "any"; then
         case $host in
         *os390|*os400|*-aix*)
           # Some -aix5 will use dl, no hassles.  Keep that pattern here.
           dsotype=other ;;
         *-hpux*)
           if test "$have_shl" = "1"; then
             dsotype=shl; APR_ADDTO(LIBS,-ldld)
           fi;;
         esac
     fi
 fi
 
 if test "$dsotype" = "any"; then
     AC_MSG_ERROR([Could not detect suitable DSO implementation])
 elif test "$dsotype" = "no"; then
     aprdso="0"
 else
     case "$dsotype" 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]);;
     other) ;; # Use whatever is in dso/OSDIR
     *) AC_MSG_ERROR([Unknown DSO implementation "$dsotype"]);;
     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) 
 
 if test -z "$have_proc_invoked"; then
   have_proc_invoked="0"
 fi
 
 AC_SUBST(have_proc_invoked)
 
 AC_MSG_CHECKING(for Variable Length Arrays)
 APR_TRY_COMPILE_NO_WARNING([],
 [
     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 OS.h)
+AC_CHECK_FUNCS(semget semctl semop semtimedop flock)
+APR_IFALLYES(func:semtimedop, have_semtimedop="1", have_semtimedop="0")
+
+AC_CHECK_HEADERS(semaphore.h)
 AC_SEARCH_LIBS(sem_open, rt)
-AC_CHECK_FUNCS(sem_close sem_unlink sem_post sem_wait create_sem)
+AC_CHECK_FUNCS(sem_close sem_unlink sem_post sem_wait sem_timedwait)
+APR_IFALLYES(func:sem_timedwait, have_sem_timedwait="1", have_sem_timedwait="0")
 
+AC_CHECK_HEADERS(OS.h)
+AC_CHECK_FUNCS(create_sem acquire_sem acquire_sem_etc)
+APR_IFALLYES(header:OS.h func:acquire_sem_etc, have_acquire_sem_etc="1", have_acquire_sem_etc="0")
+
 # 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>
 #ifndef SEM_FAILED
 #define SEM_FAILED (-1)
 #endif
 main()
 {
     sem_t *psem;
     const char *sem_name = "/apr_autoconf";
 
     psem = sem_open(sem_name, O_CREAT, 0644, 1);
     if (psem == (sem_t *)SEM_FAILED) {
 	exit(1);
     }
     sem_close(psem);
     psem = sem_open(sem_name, O_CREAT | O_EXCL, 0644, 1);
     if (psem != (sem_t *)SEM_FAILED) {
         sem_close(psem);
         exit(1);
     }
     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)
+    AC_CHECK_FUNCS(pthread_mutex_timedlock pthread_mutexattr_setpshared)
+    APR_IFALLYES(header:pthread.h func:pthread_mutex_timedlock,
+                 have_pthread_mutex_timedlock="1", have_pthread_mutex_timedlock="0")
+    AC_SUBST(have_pthread_mutex_timedlock)
     # 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:semget func:semctl func:semop 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(header:OS.h func:create_sem, hasbeossem="1", hasbeossem="0")
 
+AC_CHECK_FUNCS(pthread_condattr_setpshared)
+APR_IFALLYES(header:pthread.h func:pthread_condattr_setpshared,
+             have_pthread_condattr_setpshared="1", have_pthread_condattr_setpshared="0")
+AC_SUBST(have_pthread_condattr_setpshared)
+
 # 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.
 # The BEOSSEM decision doesn't require any substitutions but is
 # included here to prevent the fcntl() branch being selected
 # from the decision making.
 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_IFALLYES(func:semget func:semctl func:semop define:SEM_UNDO,
             APR_DECIDE(USE_SYSVSEM_SERIALIZE, [SysV IPC semget()]))
-APR_IFALLYES(header:OS.h func:create_sem, 
+APR_IFALLYES(header:OS.h func:create_sem func:acquire_sem func:acquire_sem_etc, 
             APR_DECIDE(USE_BEOSSEM, [BeOS Semaphores])) 
+# pthread mutex both pshared and robust[_np] is the best default
+case "$apr_cv_mutex_robust_shared" in
+"yes"|"np")
+    APR_DECIDE(USE_PROC_PTHREAD_SERIALIZE, [pthread pshared mutex]) 
+    ;;
+*)
+    ;;
+esac
 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"
         ;;
     USE_BEOSSEM )
         beossem="1"
         ;;
 esac
 
 if test $hasfcntlser = "1"; then
 AC_MSG_CHECKING(if fcntl returns EACCES when F_SETLK is already held)
 AC_TRY_RUN([
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
 #include <fcntl.h>
 #include <errno.h>
 
 int fd;
 struct flock proc_mutex_lock_it = {0};
 const char *fname = "conftest.fcntl";
 
 int main()
 {
     int rc, status;;
     proc_mutex_lock_it.l_whence = SEEK_SET;   /* from current point */
     proc_mutex_lock_it.l_type = F_WRLCK;      /* set exclusive/write lock */
 
     fd = creat(fname, S_IRWXU);
     unlink(fname);
 
     if (rc = lockit()) {
         exit(-1);
     }
 
     if (fork()) {
         wait(&status);
     }
     else {
       return(lockit());
     }
 
     close(fd);
     exit(WEXITSTATUS(status) != EACCES);
 }
 
 int lockit() {
     int rc;
     do {
         rc = fcntl(fd, F_SETLK, &proc_mutex_lock_it);
     } while ( rc < 0 && errno == EINTR);
 
     return (rc < 0) ? errno : 0;
 }], [apr_fcntl_tryacquire_eacces=1], [apr_fcntl_tryacquire_eacces=0], [apr_fcntl_tryacquire_eacces=0])
 fi
 
 if test "$apr_fcntl_tryacquire_eacces" = "1"; then
   AC_DEFINE(FCNTL_TRYACQUIRE_EACCES, 1, [Define if fcntl returns EACCES when F_SETLK is already held])
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
 fi
 
 
 AC_SUBST(hasflockser)
 AC_SUBST(hassysvser)
 AC_SUBST(hasposixser)
 AC_SUBST(hasfcntlser)
 AC_SUBST(hasprocpthreadser)
 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_CHECK_HEADERS(sys/random.h)
+AC_CHECK_FUNCS(getrandom)
+
+AC_CHECK_HEADERS(sys/syscall.h)
+AC_CHECK_HEADERS(linux/random.h)
+AC_CHECK_DECLS([SYS_getrandom], [], [], [#include <sys/syscall.h>])
+
+AC_CHECK_FUNCS(arc4random_buf)
+
 AC_MSG_CHECKING(for entropy source)
 
 why_no_rand=""
 
 AC_ARG_WITH(egd, 
   [  --with-egd[[=DIR]]        use EGD-compatible socket],
   [ AC_DEFINE(HAVE_EGD, 1, [Define if EGD is supported])
     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
+  if test "$ac_cv_func_getrandom" = yes; then
+    rand="getrandom"
+  elif test "$ac_cv_have_decl_SYS_getrandom" = yes; then
+    rand="SYS_getrandom"
+  elif test "$ac_cv_func_arc4random_buf" = yes; then
+    rand="arc4random"
+  fi
+fi
+
+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" ])
+    [ apr_devrandom="$withval" ], [ apr_devrandom="no" ])
+  if test "$apr_devrandom" = "no"; then
+    if test -z "$rand"; then
+      apr_devrandom="yes"
+    else
+      apr_devrandom="no"
+    fi
+  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/urandom /dev/random; do
       if test -r $f; then
         apr_devrandom=$f
-        rand=1
+        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
     case $host in
       *os390)
         if test $os_version -lt 1700; then
           rand="0"
           why_no_rand=" ($apr_devrandom unusable on z/OS before V1R7)"
         fi
         ;;
     esac
   fi
 
   if test "$rand" = "1"; then
     AC_DEFINE_UNQUOTED(DEV_RANDOM, ["$apr_devrandom"], [Define to path of random device])
     AC_MSG_RESULT([$apr_devrandom])
+  elif test -n "$rand"; then
+    AC_DEFINE_UNQUOTED(SYS_RANDOM, ["$rand"], [Define system call of random])
+    AC_MSG_RESULT([$rand])
+    rand="1"
   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$why_no_rand)
                 rand="0"
               fi
             fi
             ;;
     esac
 fi
 
 AC_SUBST(rand)
 
 dnl ----------------------------- Checking for File Info Support 
 echo "${nl}Checking for File Info Support..."
 AC_CHECK_MEMBERS([struct stat.st_blocks, struct stat.st_atimensec,
 struct stat.st_ctimensec, struct stat.st_mtimensec, struct stat.st_atim.tv_nsec,
 struct stat.st_ctim.tv_nsec, struct stat.st_mtim.tv_nsec,
 struct stat.st_atime_n, struct stat.st_ctime_n, struct stat.st_mtime_n],,,[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif])
 
 APR_CHECK_DIRENT_INODE
 APR_CHECK_DIRENT_TYPE
 
 dnl ----------------------------- Checking for UUID Support 
 echo "${nl}Checking for OS UUID Support..."
 
 AC_CHECK_HEADERS(uuid.h uuid/uuid.h sys/uuid.h, break)
 
 apr_revert_save_LIBS=$LIBS
 
 # Prefer the flavor(s) that live in libc;
 AC_SEARCH_LIBS(uuid_create, uuid)
 AC_SEARCH_LIBS(uuid_generate, uuid)
 if test "$ac_cv_search_uuid_create" = "none required" -o \
         "$ac_cv_search_uuid_generate" = "none required"; then
  LIBS=$apr_revert_save_LIBS
 fi
 
 AC_CHECK_FUNCS(uuid_create uuid_generate)
 
 AC_CACHE_CHECK([for os uuid usability], [apr_cv_osuuid], [
 # Ensure this test closely mirrors misc/unix/rand.c!
 uuid_includes="
 #if defined(HAVE_SYS_TYPES_H)
 #include <sys/types.h>
 #endif
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
 #if defined(HAVE_UUID_H)
 #include <uuid.h>
 #elif defined(HAVE_UUID_UUID_H)
 #include <uuid/uuid.h>
 #elif defined(HAVE_SYS_UUID_H)
 #include <sys/uuid.h>
 #endif
 "
  apr_cv_osuuid=no
  if test $ac_cv_func_uuid_create = yes; then
   AC_TRY_LINK([$uuid_includes], [
     uuid_t g;
     uint32_t s;
     uuid_create(&g, &s);
     if (s == uuid_s_ok) s = 0;
   ], [apr_cv_osuuid=yes], [apr_cv_func_uuid_create=no])
  fi
  if test $ac_cv_func_uuid_generate = yes; then
   AC_TRY_LINK([$uuid_includes], [
     uuid_t g;
     uuid_generate(g);
   ], [apr_cv_osuuid=yes], [apr_cv_func_uuid_generate=no])
  fi 
 ])
 
 if test $apr_cv_osuuid = yes; then
   osuuid="1"
 else
   osuuid="0"
   LIBS=$apr_revert_save_LIBS
 fi
 AC_SUBST(osuuid)
 
 
 dnl ----------------------------- Checking for Time Support 
 echo "${nl}Checking for Time Support..."
 
 AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,[
 #include <sys/types.h>
 #include <time.h>])
 
 dnl ----------------------------- Checking for Networking Support 
 echo "${nl}Checking for Networking support..."
 APR_TYPE_IN_ADDR
 if test "$ac_cv_type_in_addr" = "yes"; then
   have_in_addr="1"
 else
   have_in_addr="0"
 fi
 
 AC_MSG_CHECKING([if fd == socket on this platform])
 if test "x$file_as_socket" != "x0" ; then
     file_as_socket="1";
     echo "yes"
 else
     echo "no"
 fi
 
 AC_SUBST(have_in_addr)
 AC_SUBST(file_as_socket)
 
 if test "$ac_cv_func_poll $file_as_socket" = "yes 1"; then
     AC_DEFINE(WAITIO_USES_POLL, 1,
               [Define if apr_wait_for_io_or_timeout() uses poll(2)])
 fi
 
 # Check the types only if we have gethostbyname_r
 if test "$ac_cv_func_gethostbyname_r" = "yes"; then
     APR_CHECK_GETHOSTBYNAME_R_STYLE
 fi
 
 # Check the types only if we have getservbyname_r
 if test "$ac_cv_func_getservbyname_r" = "yes"; then
     APR_CHECK_GETSERVBYNAME_R_STYLE
 fi
 
 APR_CHECK_TCP_NODELAY_INHERITED
 APR_CHECK_O_NONBLOCK_INHERITED
 APR_CHECK_TCP_NODELAY_WITH_CORK
 
 # 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
 APR_CHECK_MCAST
 
 AC_SUBST(apr_tcp_nopush_flag)
 AC_SUBST(have_corkable_tcp)
 AC_SUBST(acceptfilter)
 AC_SUBST(have_sctp)
 
 AC_CHECK_FUNCS(set_h_errno)
 
 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)
+AC_CHECK_FUNCS(gai_strerror if_nametoindex if_indextoname)
 APR_CHECK_WORKING_GETADDRINFO
 APR_CHECK_NEGATIVE_EAI
 APR_CHECK_WORKING_GETNAMEINFO
 APR_CHECK_SOCKADDR_IN6
 APR_CHECK_SOCKADDR_STORAGE
+APR_CHECK_SOCKADDR_UN
 
 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
                     APR_CHECK_GETADDRINFO_ADDRCONFIG
                     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)
+
+AC_ARG_ENABLE(timedlocks,
+  [  --disable-timedlocks	  Disable timed locks ],
+  [apr_has_timedlocks="0"], [apr_has_timedlocks="1"]
+)
+AC_SUBST(apr_has_timedlocks)
 
 # hstrerror is only needed if IPv6 is not enabled,
 # so getaddrinfo/gai_strerror are not used.
 if test $have_ipv6 = 0; then
   AC_SEARCH_LIBS(hstrerror, resolv,
     [AC_DEFINE(HAVE_HSTRERROR, 1, [Define if hstrerror is present])])
 fi
 
 dnl Check for langinfo support
 
 AC_CHECK_HEADERS(langinfo.h)
 AC_CHECK_FUNCS(nl_langinfo)
 
 dnl ------------------------------ Defaults for some platform nuances
 
 dnl Do we have a Win32-centric Unicode FS?
 APR_SETIFNULL(have_unicode_fs, [0])
 AC_SUBST(have_unicode_fs)
 
 APR_SETIFNULL(apr_has_xthread_files, [0])
 AC_SUBST(apr_has_xthread_files)
 
 APR_SETIFNULL(apr_procattr_user_set_requires_password, [0])
 AC_SUBST(apr_procattr_user_set_requires_password)
 
 APR_SETIFNULL(apr_thread_func, [])
 AC_SUBST(apr_thread_func)
 
 APR_SETIFNULL(apr_has_user, [1])
 AC_SUBST(apr_has_user)
 
 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(INTERNAL_CPPFLAGS)
 AC_SUBST(LDLIBS)
 AC_SUBST(INCLUDES)
 AC_SUBST(AR)
 AC_SUBST(RM)
 AC_SUBST(OSDIR)
 AC_SUBST(DEFAULT_OSDIR)
 AC_SUBST(EXEEXT)
 AC_SUBST(LIBTOOL_LIBS)
 
 # Use -no-install or -no-fast-install to link the test 
 # programs on all platforms but Darwin, where it would cause
 # the programs to be linked against installed versions of
 # libapr instead of those just built.
 case $host in
     *-apple-darwin*)
         LT_NO_INSTALL=""
         ;;
     *-mingw*)
         LT_NO_INSTALL="-no-fast-install"
         ;;
     *)
         LT_NO_INSTALL="-no-install"
         ;;
 esac
 AC_SUBST(LT_NO_INSTALL)
 
 #
 # 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"
 	INCLUDE_OUTPUTS="include $apr_srcdir/build-outputs.mk"
     else
 	# BSDi make
 	INCLUDE_RULES=".include \"$apr_buildout/apr_rules.mk\""
 	INCLUDE_OUTPUTS=".include \"$apr_srcdir/build-outputs.mk\""
     fi
     ;;
 *)
     INCLUDE_RULES="include $apr_buildout/apr_rules.mk"
     INCLUDE_OUTPUTS="include $apr_srcdir/build-outputs.mk"
     ;;
 esac
 AC_SUBST(INCLUDE_RULES)
 AC_SUBST(INCLUDE_OUTPUTS)
 
 AC_CONFIG_FILES([Makefile
                  include/apr.h
                  build/apr_rules.mk
                  build/pkg/pkginfo
                  apr-$APR_MAJOR_VERSION-config:apr-config.in
                  apr.pc])
 
 if test -d $srcdir/test; then
    AC_CONFIG_FILES([test/Makefile test/internal/Makefile])
 fi
 
 dir=include/arch/unix
 test -d $dir || $MKDIR $dir
 
 AC_CONFIG_COMMANDS([default], [
 # Commands run at the end of config.status:
 for i in $APR_SAVE_HEADERS; do
   if cmp -s $i $i.save 2>/dev/null; then
     mv $i.save $i
     AC_MSG_NOTICE([$i is unchanged])
   fi
   rm -f $i.save
 done
 chmod +x apr-$APR_MAJOR_VERSION-config
 ],[
 dnl This section is expanded by configure UNQUOTED so variable 
 dnl references must be backslash-escaped as necessary.
 
 # Commands run at the beginning of config.status:
 APR_SAVE_HEADERS="include/apr.h include/arch/unix/apr_private.h"
 APR_MAJOR_VERSION=$APR_MAJOR_VERSION
 APR_PLATFORM=$host
 
 for apri in \${APR_SAVE_HEADERS}; do
   test -r \${apri} && mv \${apri} \${apri}.save
 done
 ])
 
 AC_OUTPUT
Index: head/contrib/apr/docs/APRDesign.html
===================================================================
--- head/contrib/apr/docs/APRDesign.html	(revision 361677)
+++ head/contrib/apr/docs/APRDesign.html	(revision 361678)
@@ -1,399 +1,399 @@
 <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
+likely to define different native types.  There are only two exceptions 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 
+reflect the current code.  If you change parameters 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>
+There are five types of error values in APR, each with its 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>
+the error code indicates an error condition or a status condition.</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
+<p>The second 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>
 
Index: head/contrib/apr/docs/canonical_filenames.html
===================================================================
--- head/contrib/apr/docs/canonical_filenames.html	(revision 361677)
+++ head/contrib/apr/docs/canonical_filenames.html	(revision 361678)
@@ -1,156 +1,156 @@
 <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
+compared, and that a mismatch is guaranteed 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
+<p>The first discrepancy is in volume roots.  Unix and pure derivatives
 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
+current working directory, which APR will treat as ambiguous, 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
+sequence 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
+codes for the same element.  Path separators 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.
+same path separator 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
+<p>The fifth and worst discrepancy plagues 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
+ASCII, since various dialectic 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
+or perhaps even a capital 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
+file uniqifiers, which is a fairly fast operation, or querying 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>
+characters are illegal (or undesirable 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 equivalence.  The
 stat implementation provides that two files are the same, while their
 strings are not equivalent, 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
+there is a penalty 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>
+with no penalties, 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>
Index: head/contrib/apr/docs/incomplete_types
===================================================================
--- head/contrib/apr/docs/incomplete_types	(revision 361677)
+++ head/contrib/apr/docs/incomplete_types	(revision 361678)
@@ -1,84 +1,84 @@
 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
+This captures the essence 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:
+And then in the definition 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 
+elapsed since a specified 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.
 
Index: head/contrib/apr/docs/pool-design.html
===================================================================
--- head/contrib/apr/docs/pool-design.html	(revision 361677)
+++ head/contrib/apr/docs/pool-design.html	(revision 361678)
@@ -1,100 +1,96 @@
 <!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 17:51:51 -0500 (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>
Index: head/contrib/apr/encoding/apr_encode.c
===================================================================
--- head/contrib/apr/encoding/apr_encode.c	(nonexistent)
+++ head/contrib/apr/encoding/apr_encode.c	(revision 361678)
@@ -0,0 +1,1419 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* encode/decode functions.
+ *
+ * These functions perform various encoding operations, and are provided in
+ * pairs, a function to query the length of and encode existing buffers, as
+ * well as companion functions to perform the same process to memory
+ * allocated from a pool.
+ *
+ * The API is designed to have the smallest possible RAM footprint, and so
+ * will only allocate the exact amount of RAM needed for each conversion.
+ */
+
+#include "apr_encode.h"
+#include "apr_lib.h"
+#include "apr_strings.h"
+#include "apr_encode_private.h"
+
+/* lookup table: fast and const should make it shared text page. */
+static const unsigned char pr2six[256] =
+{
+#if !APR_CHARSET_EBCDIC
+    /* ASCII table */
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 62, 64, 63,
+    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 128, 64, 64,
+    64, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 63,
+    64, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
+#else                           /* APR_CHARSET_EBCDIC */
+    /* EBCDIC table */
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    62, 63, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 63, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 128, 64,
+    64, 26, 27, 28, 29, 30, 31, 32, 33, 34, 64, 64, 64, 64, 64, 64,
+    64, 35, 36, 37, 38, 39, 40, 41, 42, 43, 64, 64, 64, 64, 64, 64,
+    64, 64, 44, 45, 46, 47, 48, 49, 50, 51, 64, 64, 64, 64, 64, 64,
+    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+    64, 0, 1, 2, 3, 4, 5, 6, 7, 8, 64, 64, 64, 64, 64, 64,
+    64, 9, 10, 11, 12, 13, 14, 15, 16, 17, 64, 64, 64, 64, 64, 64,
+    64, 64, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 64, 64,
+    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64
+#endif                          /* APR_CHARSET_EBCDIC */
+};
+
+static const unsigned char pr2five[256] =
+{
+#if !APR_CHARSET_EBCDIC
+    /* ASCII table */
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 26, 27, 28, 29, 30, 31, 32, 32, 32, 32, 32, 128, 32, 32,
+    32, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32
+#else                           /* APR_CHARSET_EBCDIC */
+    /* EBCDIC table */
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 128, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 0, 1, 2, 3, 4, 5, 6, 7, 8, 32, 32, 32, 32, 32, 32,
+    32, 9, 10, 11, 12, 13, 14, 15, 16, 17, 32, 32, 32, 32, 32, 32,
+    32, 32, 18, 19, 20, 21, 22, 23, 24, 25, 32, 32, 32, 32, 32, 32,
+    32, 32, 26, 27, 28, 29, 30, 31, 32, 32, 32, 32, 32, 32, 32, 32
+#endif                          /* APR_CHARSET_EBCDIC */
+};
+
+static const unsigned char pr2fivehex[256] =
+{
+#if !APR_CHARSET_EBCDIC
+    /* ASCII table */
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 32, 32, 128, 32, 32,
+    32, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+    25, 26, 27, 28, 29, 30, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32
+#else                           /* APR_CHARSET_EBCDIC */
+    /* EBCDIC table */
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 128, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 10, 11, 12, 13, 14, 15, 16, 17, 18, 32, 32, 32, 32, 32, 32,
+    32, 19, 20, 21, 22, 23, 24, 25, 26, 27, 32, 32, 32, 32, 32, 32,
+    32, 32, 28, 29, 30, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 32, 32, 32, 32, 32
+#endif                          /* APR_CHARSET_EBCDIC */
+};
+
+static const unsigned char pr2two[256] =
+{
+#if !APR_CHARSET_EBCDIC
+    /* ASCII table */
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 32, 16, 16, 16, 16, 16,
+    16, 10, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 10, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16
+#else                           /* APR_CHARSET_EBCDIC */
+    /* EBCDIC table */
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 32, 16, 16, 16, 16, 16,
+    16, 10, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 10, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 16, 16, 16, 16, 16
+#endif                          /* APR_CHARSET_EBCDIC */
+};
+
+static const char base64[] =
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static const char base64url[] =
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+
+static const char base32[] =
+"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+static const char base32hex[] =
+"0123456789ABCDEFGHIJKLMNOPQRSTUV";
+
+static const char base16[] = "0123456789ABCDEF";
+static const char base16lower[] = "0123456789abcdef";
+
+APR_DECLARE(apr_status_t) apr_encode_base64(char *dest, const char *src,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    const char *base;
+
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (APR_ENCODE_STRING == slen) {
+        slen = strlen(src);
+    }
+
+    if (dest) {
+        register char *bufout = dest;
+        int i;
+
+        if (0 == ((flags & APR_ENCODE_BASE64URL))) {
+            base = base64;
+        }
+        else {
+            base = base64url;
+        }
+
+        for (i = 0; i < slen - 2; i += 3) {
+            *bufout++ = base[ENCODE_TO_ASCII(((src[i]) >> 2) & 0x3F)];
+            *bufout++ = base[ENCODE_TO_ASCII((((src[i]) & 0x3) << 4)
+                                      | ((int)((src[i + 1]) & 0xF0) >> 4))];
+            *bufout++ = base[ENCODE_TO_ASCII((((src[i + 1]) & 0xF) << 2)
+                       | ((int)(ENCODE_TO_ASCII(src[i + 2]) & 0xC0) >> 6))];
+            *bufout++ = base[ENCODE_TO_ASCII((src[i + 2]) & 0x3F)];
+        }
+        if (i < slen) {
+            *bufout++ = base[ENCODE_TO_ASCII(((src[i]) >> 2) & 0x3F)];
+            if (i == (slen - 1)) {
+                *bufout++ = base[ENCODE_TO_ASCII((((src[i]) & 0x3) << 4))];
+                if (!(flags & APR_ENCODE_NOPADDING)) {
+                    *bufout++ = '=';
+                }
+            }
+            else {
+                *bufout++ = base[ENCODE_TO_ASCII((((src[i]) & 0x3) << 4)
+                                      | ((int)((src[i + 1]) & 0xF0) >> 4))];
+                *bufout++ = base[ENCODE_TO_ASCII(((src[i + 1]) & 0xF) << 2)];
+            }
+            if (!(flags & APR_ENCODE_NOPADDING)) {
+                *bufout++ = '=';
+            }
+        }
+
+        if (len) {
+            *len = bufout - dest;
+        }
+
+        *bufout++ = '\0';
+
+        return APR_SUCCESS;
+    }
+
+    if (len) {
+        *len = ((slen + 2) / 3 * 4) + 1;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_encode_base64_binary(char *dest, const unsigned char *src,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    const char *base;
+
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (dest) {
+        register char *bufout = dest;
+        int i;
+
+        if (0 == ((flags & APR_ENCODE_BASE64URL))) {
+            base = base64;
+        }
+        else {
+            base = base64url;
+        }
+
+        for (i = 0; i < slen - 2; i += 3) {
+            *bufout++ = base[(src[i] >> 2) & 0x3F];
+            *bufout++ = base[((src[i] & 0x3) << 4)
+                             | ((int)(src[i + 1] & 0xF0) >> 4)];
+            *bufout++ = base[((src[i + 1] & 0xF) << 2)
+                             | ((int)(src[i + 2] & 0xC0) >> 6)];
+            *bufout++ = base[src[i + 2] & 0x3F];
+        }
+        if (i < slen) {
+            *bufout++ = base[(src[i] >> 2) & 0x3F];
+            if (i == (slen - 1)) {
+                *bufout++ = base[((src[i] & 0x3) << 4)];
+                if (!(flags & APR_ENCODE_NOPADDING)) {
+                    *bufout++ = '=';
+                }
+            }
+            else {
+                *bufout++ = base[((src[i] & 0x3) << 4)
+                                 | ((int)(src[i + 1] & 0xF0) >> 4)];
+                *bufout++ = base[((src[i + 1] & 0xF) << 2)];
+            }
+            if (!(flags & APR_ENCODE_NOPADDING)) {
+                *bufout++ = '=';
+            }
+        }
+
+        if (len) {
+            *len = bufout - dest;
+        }
+
+        *bufout++ = '\0';
+
+        return APR_SUCCESS;
+    }
+
+    if (len) {
+        *len = ((slen + 2) / 3 * 4) + 1;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(const char *)apr_pencode_base64(apr_pool_t * p, const char *src,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_encode_base64(NULL, src, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            char *cmd = apr_palloc(p, size);
+            apr_encode_base64(cmd, src, slen, flags, len);
+            return cmd;
+        }
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(const char *)apr_pencode_base64_binary(apr_pool_t * p, const unsigned char *src,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_encode_base64_binary(NULL, src, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            char *cmd = apr_palloc(p, size);
+            apr_encode_base64_binary(cmd, src, slen, flags, len);
+            return cmd;
+        }
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(apr_status_t) apr_decode_base64(char *dest, const char *src,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (APR_ENCODE_STRING == slen) {
+        slen = strlen(src);
+    }
+
+    if (dest) {
+        register const unsigned char *bufin;
+        register unsigned char *bufout;
+        register apr_size_t nprbytes;
+        register apr_size_t count = slen;
+
+        apr_status_t status;
+
+        bufin = (const unsigned char *)src;
+        while (pr2six[*(bufin++)] < 64 && count)
+            count--;
+        nprbytes = (bufin - (const unsigned char *)src) - 1;
+        while (pr2six[*(bufin++)] > 64 && count)
+            count--;
+
+        status = flags & APR_ENCODE_RELAXED ? APR_SUCCESS :
+            count ? APR_BADCH : APR_SUCCESS;
+
+        bufout = (unsigned char *)dest;
+        bufin = (const unsigned char *)src;
+
+        while (nprbytes > 4) {
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(pr2six[bufin[0]] << 2
+                                                   | pr2six[bufin[1]] >> 4);
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(
+                             pr2six[bufin[1]] << 4 | pr2six[bufin[2]] >> 2);
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(
+                                  pr2six[bufin[2]] << 6 | pr2six[bufin[3]]);
+            bufin += 4;
+            nprbytes -= 4;
+        }
+
+        if (nprbytes == 1) {
+            status = APR_BADCH;
+        }
+        if (nprbytes > 1) {
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(
+                               pr2six[*bufin] << 2 | pr2six[bufin[1]] >> 4);
+        }
+        if (nprbytes > 2) {
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(
+                             pr2six[bufin[1]] << 4 | pr2six[bufin[2]] >> 2);
+        }
+        if (nprbytes > 3) {
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(
+                                  pr2six[bufin[2]] << 6 | pr2six[bufin[3]]);
+        }
+
+        if (len) {
+            *len = bufout - (unsigned char *)dest;
+        }
+
+        *(bufout++) = 0;
+
+        return status;
+    }
+
+    if (len) {
+        *len = (((int)slen + 3) / 4) * 3 + 1;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_decode_base64_binary(unsigned char *dest,
+             const char *src, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (APR_ENCODE_STRING == slen) {
+        slen = strlen(src);
+    }
+
+    if (dest) {
+        register const unsigned char *bufin;
+        register unsigned char *bufout;
+        register apr_size_t nprbytes;
+        register apr_size_t count = slen;
+
+        apr_status_t status;
+
+        bufin = (const unsigned char *)src;
+        while (pr2six[*(bufin++)] < 64 && count)
+            count--;
+        nprbytes = (bufin - (const unsigned char *)src) - 1;
+        while (pr2six[*(bufin++)] > 64 && count)
+            count--;
+
+        status = flags & APR_ENCODE_RELAXED ? APR_SUCCESS :
+            count ? APR_BADCH : APR_SUCCESS;
+
+        bufout = (unsigned char *)dest;
+        bufin = (const unsigned char *)src;
+
+        while (nprbytes > 4) {
+            *(bufout++) = (unsigned char)(pr2six[bufin[0]] << 2
+                                          | pr2six[bufin[1]] >> 4);
+            *(bufout++) = (unsigned char)(pr2six[bufin[1]] << 4
+                                          | pr2six[bufin[2]] >> 2);
+            *(bufout++) = (unsigned char)(pr2six[bufin[2]] << 6
+                                          | pr2six[bufin[3]]);
+            bufin += 4;
+            nprbytes -= 4;
+        }
+
+        if (nprbytes == 1) {
+            status = APR_BADCH;
+        }
+        if (nprbytes > 1) {
+            *(bufout++) = (unsigned char)(pr2six[bufin[0]] << 2
+                                          | pr2six[bufin[1]] >> 4);
+        }
+        if (nprbytes > 2) {
+            *(bufout++) = (unsigned char)(pr2six[bufin[1]] << 4
+                                          | pr2six[bufin[2]] >> 2);
+        }
+        if (nprbytes > 3) {
+            *(bufout++) = (unsigned char)(pr2six[bufin[2]] << 6
+                                          | pr2six[bufin[3]]);
+        }
+
+        if (len) {
+            *len = bufout - dest;
+        }
+
+        return status;
+    }
+
+    if (len) {
+        *len = (((int)slen + 3) / 4) * 3;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(const char *)apr_pdecode_base64(apr_pool_t * p, const char *str,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_decode_base64(NULL, str, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            void *cmd = apr_palloc(p, size);
+            apr_decode_base64(cmd, str, slen, flags, len);
+            return cmd;
+        }
+    case APR_BADCH:
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(const unsigned char *)apr_pdecode_base64_binary(apr_pool_t * p,
+             const char *str, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_decode_base64_binary(NULL, str, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            unsigned char *cmd = apr_palloc(p, size + 1);
+            cmd[size] = 0;
+            apr_decode_base64_binary(cmd, str, slen, flags, len);
+            return cmd;
+        }
+    case APR_BADCH:
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(apr_status_t) apr_encode_base32(char *dest, const char *src,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    const char *base;
+
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (APR_ENCODE_STRING == slen) {
+        slen = strlen(src);
+    }
+
+    if (dest) {
+        register char *bufout = dest;
+        int i;
+
+        if (!((flags & APR_ENCODE_BASE32HEX))) {
+            base = base32;
+        }
+        else {
+            base = base32hex;
+        }
+
+        for (i = 0; i < slen - 4; i += 5) {
+            *bufout++ = base[ENCODE_TO_ASCII((src[i] >> 3) & 0x1F)];
+            *bufout++ = base[ENCODE_TO_ASCII(((src[i] << 2) & 0x1C)
+                                             | ((src[i + 1] >> 6) & 0x3))];
+            *bufout++ = base[ENCODE_TO_ASCII((src[i + 1] >> 1) & 0x1F)];
+            *bufout++ = base[ENCODE_TO_ASCII(((src[i + 1] << 4) & 0x10)
+                                             | ((src[i + 2] >> 4) & 0xF))];
+            *bufout++ = base[ENCODE_TO_ASCII(((src[i + 2] << 1) & 0x1E)
+                                             | ((src[i + 3] >> 7) & 0x1))];
+            *bufout++ = base[ENCODE_TO_ASCII((src[i + 3] >> 2) & 0x1F)];
+            *bufout++ = base[ENCODE_TO_ASCII(((src[i + 3] << 3) & 0x18)
+                                             | ((src[i + 4] >> 5) & 0x7))];
+            *bufout++ = base[ENCODE_TO_ASCII(src[i + 4] & 0x1F)];
+        }
+        if (i < slen) {
+            *bufout++ = base[ENCODE_TO_ASCII(src[i] >> 3) & 0x1F];
+            if (i == (slen - 1)) {
+                *bufout++ = base[ENCODE_TO_ASCII((src[i] << 2) & 0x1C)];
+                if (!(flags & APR_ENCODE_NOPADDING)) {
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                }
+            }
+            else if (i == (slen - 2)) {
+                *bufout++ = base[ENCODE_TO_ASCII(((src[i] << 2) & 0x1C)
+                                              | ((src[i + 1] >> 6) & 0x3))];
+                *bufout++ = base[ENCODE_TO_ASCII((src[i + 1] >> 1) & 0x1F)];
+                *bufout++ = base[ENCODE_TO_ASCII((src[i + 1] << 4) & 0x10)];
+                if (!(flags & APR_ENCODE_NOPADDING)) {
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                }
+            }
+            else if (i == (slen - 3)) {
+                *bufout++ = base[ENCODE_TO_ASCII(((src[i] << 2) & 0x1C)
+                                              | ((src[i + 1] >> 6) & 0x3))];
+                *bufout++ = base[ENCODE_TO_ASCII((src[i + 1] >> 1) & 0x1F)];
+                *bufout++ = base[ENCODE_TO_ASCII(((src[i + 1] << 4) & 0x10)
+                                              | ((src[i + 2] >> 4) & 0xF))];
+                *bufout++ = base[ENCODE_TO_ASCII((src[i + 2] << 1) & 0x1E)];
+                if (!(flags & APR_ENCODE_NOPADDING)) {
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                }
+            }
+            else {
+                *bufout++ = base[ENCODE_TO_ASCII(((src[i] << 2) & 0x1C)
+                                              | ((src[i + 1] >> 6) & 0x3))];
+                *bufout++ = base[ENCODE_TO_ASCII((src[i + 1] >> 1) & 0x1F)];
+                *bufout++ = base[ENCODE_TO_ASCII(((src[i + 1] << 4) & 0x10)
+                                              | ((src[i + 2] >> 4) & 0xF))];
+                *bufout++ = base[ENCODE_TO_ASCII(((src[i + 2] << 1) & 0x1E)
+                                              | ((src[i + 3] >> 7) & 0x1))];
+                *bufout++ = base[ENCODE_TO_ASCII((src[i + 3] >> 2) & 0x1F)];
+                *bufout++ = base[ENCODE_TO_ASCII((src[i + 3] << 3) & 0x18)];
+                if (!(flags & APR_ENCODE_NOPADDING)) {
+                    *bufout++ = '=';
+                }
+            }
+        }
+
+        if (len) {
+            *len = bufout - dest;
+        }
+
+        *bufout++ = '\0';
+
+        return APR_SUCCESS;
+    }
+
+    if (len) {
+        *len = ((slen + 2) / 3 * 4) + 1;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_encode_base32_binary(char *dest, const unsigned char *src,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    const char *base;
+
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (dest) {
+        register char *bufout = dest;
+        int i;
+
+        if (!((flags & APR_ENCODE_BASE32HEX))) {
+            base = base32;
+        }
+        else {
+            base = base32hex;
+        }
+
+        for (i = 0; i < slen - 4; i += 5) {
+            *bufout++ = base[((src[i] >> 3) & 0x1F)];
+            *bufout++ = base[(((src[i] << 2) & 0x1C)
+                              | ((src[i + 1] >> 6) & 0x3))];
+            *bufout++ = base[((src[i + 1] >> 1) & 0x1F)];
+            *bufout++ = base[(((src[i + 1] << 4) & 0x10)
+                              | ((src[i + 2] >> 4) & 0xF))];
+            *bufout++ = base[(((src[i + 2] << 1) & 0x1E)
+                              | ((src[i + 3] >> 7) & 0x1))];
+            *bufout++ = base[((src[i + 3] >> 2) & 0x1F)];
+            *bufout++ = base[(((src[i + 3] << 3) & 0x18)
+                              | ((src[i + 4] >> 5) & 0x7))];
+            *bufout++ = base[(src[i + 4] & 0x1F)];
+        }
+        if (i < slen) {
+            *bufout++ = base[(src[i] >> 3) & 0x1F];
+            if (i == (slen - 1)) {
+                *bufout++ = base[((src[i] << 2) & 0x1C)];
+                if (!(flags & APR_ENCODE_NOPADDING)) {
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                }
+            }
+            else if (i == (slen - 2)) {
+                *bufout++ = base[(((src[i] << 2) & 0x1C)
+                                  | ((src[i + 1] >> 6) & 0x3))];
+                *bufout++ = base[((src[i + 1] >> 1) & 0x1F)];
+                *bufout++ = base[((src[i + 1] << 4) & 0x10)];
+                if (!(flags & APR_ENCODE_NOPADDING)) {
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                }
+            }
+            else if (i == (slen - 3)) {
+                *bufout++ = base[(((src[i] << 2) & 0x1C)
+                                  | ((src[i + 1] >> 6) & 0x3))];
+                *bufout++ = base[((src[i + 1] >> 1) & 0x1F)];
+                *bufout++ = base[(((src[i + 1] << 4) & 0x10)
+                                  | ((int)(src[i + 2] >> 4) & 0xF))];
+                *bufout++ = base[((src[i + 2] << 1) & 0x1E)];
+                if (!(flags & APR_ENCODE_NOPADDING)) {
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                    *bufout++ = '=';
+                }
+            }
+            else {
+                *bufout++ = base[(((src[i] << 2) & 0x1C)
+                                  | ((src[i + 1] >> 6) & 0x3))];
+                *bufout++ = base[((src[i + 1] >> 1) & 0x1F)];
+                *bufout++ = base[(((src[i + 1] << 4) & 0x10)
+                                  | ((src[i + 2] >> 4) & 0xF))];
+                *bufout++ = base[(((src[i + 2] << 1) & 0x1E)
+                                  | ((src[i + 3] >> 7) & 0x1))];
+                *bufout++ = base[((src[i + 3] >> 2) & 0x1F)];
+                *bufout++ = base[((src[i + 3] << 3) & 0x18)];
+                if (!(flags & APR_ENCODE_NOPADDING)) {
+                    *bufout++ = '=';
+                }
+            }
+        }
+
+        if (len) {
+            *len = bufout - dest;
+        }
+
+        *bufout++ = '\0';
+
+        return APR_SUCCESS;
+    }
+
+    if (len) {
+        *len = ((slen + 4) / 5 * 8) + 1;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(const char *)apr_pencode_base32(apr_pool_t * p, const char *src,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_encode_base32(NULL, src, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            char *cmd = apr_palloc(p, size);
+            apr_encode_base32(cmd, src, slen, flags, len);
+            return cmd;
+        }
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(const char *)apr_pencode_base32_binary(apr_pool_t * p, const unsigned char *src,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_encode_base32_binary(NULL, src, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            char *cmd = apr_palloc(p, size);
+            apr_encode_base32_binary(cmd, src, slen, flags, len);
+            return cmd;
+        }
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(apr_status_t) apr_decode_base32(char *dest, const char *src,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (APR_ENCODE_STRING == slen) {
+        slen = strlen(src);
+    }
+
+    if (dest) {
+        register const unsigned char *bufin;
+        register unsigned char *bufout;
+        register apr_size_t nprbytes;
+        register apr_size_t count = slen;
+
+        const unsigned char *pr2;
+
+        apr_status_t status;
+
+        if ((flags & APR_ENCODE_BASE32HEX)) {
+            pr2 = pr2fivehex;
+        }
+        else {
+            pr2 = pr2five;
+        }
+
+        bufin = (const unsigned char *)src;
+        while (pr2[*(bufin++)] < 32 && count)
+            count--;
+        nprbytes = (bufin - (const unsigned char *)src) - 1;
+        while (pr2[*(bufin++)] > 32 && count)
+            count--;
+
+        status = flags & APR_ENCODE_RELAXED ? APR_SUCCESS :
+            count ? APR_BADCH : APR_SUCCESS;
+
+        bufout = (unsigned char *)dest;
+        bufin = (const unsigned char *)src;
+
+        while (nprbytes > 8) {
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(pr2[bufin[0]] << 3
+                                                      | pr2[bufin[1]] >> 2);
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(pr2[bufin[1]] << 6
+                                 | pr2[bufin[2]] << 1 | pr2[bufin[3]] >> 4);
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(pr2[bufin[3]] << 4
+                                                      | pr2[bufin[4]] >> 1);
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(pr2[bufin[4]] << 7
+                                 | pr2[bufin[5]] << 2 | pr2[bufin[6]] >> 3);
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(pr2[bufin[6]] << 5
+                                                          | pr2[bufin[7]]);
+            bufin += 8;
+            nprbytes -= 8;
+        }
+
+        if (nprbytes == 1) {
+            status = APR_BADCH;
+        }
+        if (nprbytes >= 2) {
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(
+                                   pr2[bufin[0]] << 3 | pr2[bufin[1]] >> 2);
+        }
+        if (nprbytes == 3) {
+            status = APR_BADCH;
+        }
+        if (nprbytes >= 4) {
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(
+                                     pr2[bufin[1]] << 6 | pr2[bufin[2]] << 1
+                                                      | pr2[bufin[3]] >> 4);
+        }
+        if (nprbytes >= 5) {
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(pr2[bufin[3]] << 4
+                                                      | pr2[bufin[4]] >> 1);
+        }
+        if (nprbytes == 6) {
+            status = APR_BADCH;
+        }
+        if (nprbytes >= 7) {
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(pr2[bufin[4]] << 7
+                                 | pr2[bufin[5]] << 2 | pr2[bufin[6]] >> 3);
+        }
+        if (nprbytes == 8) {
+            *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(pr2[bufin[6]] << 5
+                                                          | pr2[bufin[7]]);
+        }
+
+        if (len) {
+            *len = bufout - (unsigned char *)dest;
+        }
+
+        *(bufout++) = 0;
+
+        return status;
+    }
+
+    if (len) {
+        *len = (((int)slen + 7) / 8) * 5 + 1;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_decode_base32_binary(unsigned char *dest,
+             const char *src, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (APR_ENCODE_STRING == slen) {
+        slen = strlen(src);
+    }
+
+    if (dest) {
+        register const unsigned char *bufin;
+        register unsigned char *bufout;
+        register apr_size_t nprbytes;
+        register apr_size_t count = slen;
+
+        const unsigned char *pr2;
+
+        apr_status_t status;
+
+        if ((flags & APR_ENCODE_BASE32HEX)) {
+            pr2 = pr2fivehex;
+        }
+        else {
+            pr2 = pr2five;
+        }
+
+        bufin = (const unsigned char *)src;
+        while (pr2[*(bufin++)] < 32 && count)
+            count--;
+        nprbytes = (bufin - (const unsigned char *)src) - 1;
+        while (pr2[*(bufin++)] > 32 && count)
+            count--;
+
+        status = flags & APR_ENCODE_RELAXED ? APR_SUCCESS :
+            count ? APR_BADCH : APR_SUCCESS;
+
+        bufout = (unsigned char *)dest;
+        bufin = (const unsigned char *)src;
+
+        while (nprbytes > 8) {
+            *(bufout++) = (unsigned char)(pr2[bufin[0]] << 3
+                                          | pr2[bufin[1]] >> 2);
+            *(bufout++) = (unsigned char)(pr2[bufin[1]] << 6
+                                 | pr2[bufin[2]] << 1 | pr2[bufin[3]] >> 4);
+            *(bufout++) = (unsigned char)(pr2[bufin[3]] << 4
+                                          | pr2[bufin[4]] >> 1);
+            *(bufout++) = (unsigned char)(pr2[bufin[4]] << 7
+                                 | pr2[bufin[5]] << 2 | pr2[bufin[6]] >> 3);
+            *(bufout++) = (unsigned char)(pr2[bufin[6]] << 5
+                                          | pr2[bufin[7]]);
+            bufin += 8;
+            nprbytes -= 8;
+        }
+
+        if (nprbytes == 1) {
+            status = APR_BADCH;
+        }
+        if (nprbytes >= 2) {
+            *(bufout++) = (unsigned char)(
+                                   pr2[bufin[0]] << 3 | pr2[bufin[1]] >> 2);
+        }
+        if (nprbytes == 3) {
+            status = APR_BADCH;
+        }
+        if (nprbytes >= 4) {
+            *(bufout++) = (unsigned char)(
+                                     pr2[bufin[1]] << 6 | pr2[bufin[2]] << 1
+                                          | pr2[bufin[3]] >> 4);
+        }
+        if (nprbytes >= 5) {
+            *(bufout++) = (unsigned char)(pr2[bufin[3]] << 4
+                                          | pr2[bufin[4]] >> 1);
+        }
+        if (nprbytes == 6) {
+            status = APR_BADCH;
+        }
+        if (nprbytes >= 7) {
+            *(bufout++) = (unsigned char)(pr2[bufin[4]] << 7
+                                 | pr2[bufin[5]] << 2 | pr2[bufin[6]] >> 3);
+        }
+        if (nprbytes == 8) {
+            *(bufout++) = (unsigned char)(pr2[bufin[6]] << 5
+                                          | pr2[bufin[7]]);
+        }
+
+        if (len) {
+            *len = bufout - dest;
+        }
+
+        return status;
+    }
+
+    if (len) {
+        *len = (((int)slen + 7) / 8) * 5;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(const char *)apr_pdecode_base32(apr_pool_t * p, const char *str,
+                              apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_decode_base32(NULL, str, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            void *cmd = apr_palloc(p, size);
+            apr_decode_base32(cmd, str, slen, flags, len);
+            return cmd;
+        }
+    case APR_BADCH:
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(const unsigned char *)apr_pdecode_base32_binary(apr_pool_t * p,
+             const char *str, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_decode_base32_binary(NULL, str, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            unsigned char *cmd = apr_palloc(p, size + 1);
+            cmd[size] = 0;
+            apr_decode_base32_binary(cmd, str, slen, flags, len);
+            return cmd;
+        }
+    case APR_BADCH:
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(apr_status_t) apr_encode_base16(char *dest,
+             const char *src, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    const char *in = src;
+    apr_size_t size;
+
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (dest) {
+        register char *bufout = dest;
+        const char *base;
+
+        if ((flags & APR_ENCODE_LOWER)) {
+            base = base16lower;
+        }
+        else {
+            base = base16;
+        }
+
+        for (size = 0; (APR_ENCODE_STRING == slen) ? in[size] : size < slen; size++) {
+            if ((flags & APR_ENCODE_COLON) && size) {
+                *(bufout++) = ':';
+            }
+            *(bufout++) = base[(const unsigned char)(ENCODE_TO_ASCII(in[size])) >> 4];
+            *(bufout++) = base[(const unsigned char)(ENCODE_TO_ASCII(in[size])) & 0xf];
+        }
+
+        if (len) {
+            *len = bufout - dest;
+        }
+
+        *bufout = '\0';
+
+        return APR_SUCCESS;
+    }
+
+    if (len) {
+        if (APR_ENCODE_STRING == slen) {
+            slen = strlen(src);
+        }
+        if ((flags & APR_ENCODE_COLON) && slen) {
+            *len = slen * 3;
+        }
+        else {
+            *len = slen * 2 + 1;
+        }
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_encode_base16_binary(char *dest,
+    const unsigned char *src, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    const unsigned char *in = src;
+    apr_size_t size;
+
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (dest) {
+        register char *bufout = dest;
+        const char *base;
+
+        if ((flags & APR_ENCODE_LOWER)) {
+            base = base16lower;
+        }
+        else {
+            base = base16;
+        }
+
+        for (size = 0; size < slen; size++) {
+            if ((flags & APR_ENCODE_COLON) && size) {
+                *(bufout++) = ':';
+            }
+            *(bufout++) = base[in[size] >> 4];
+            *(bufout++) = base[in[size] & 0xf];
+        }
+
+        if (len) {
+            *len = bufout - dest;
+        }
+
+        *bufout = 0;
+
+        return APR_SUCCESS;
+    }
+
+    if (len) {
+        if ((flags & APR_ENCODE_COLON) && slen) {
+            *len = slen * 3;
+        }
+        else {
+            *len = slen * 2 + 1;
+        }
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(const char *)apr_pencode_base16(apr_pool_t * p,
+             const char *src, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_encode_base16(NULL, src, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            char *cmd = apr_palloc(p, size);
+            apr_encode_base16(cmd, src, slen, flags, len);
+            return cmd;
+        }
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(const char *)apr_pencode_base16_binary(apr_pool_t * p,
+                      const unsigned char *src, apr_ssize_t slen, int flags,
+                                                   apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_encode_base16_binary(NULL, src, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            char *cmd = apr_palloc(p, size);
+            apr_encode_base16_binary(cmd, src, slen, flags, len);
+            return cmd;
+        }
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(apr_status_t) apr_decode_base16(char *dest,
+             const char *src, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    register const unsigned char *bufin;
+    register unsigned char *bufout;
+    register apr_size_t nprbytes;
+    register apr_size_t count;
+
+    apr_status_t status;
+
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (APR_ENCODE_STRING == slen) {
+        slen = strlen(src);
+    }
+
+    count = slen;
+    bufin = (const unsigned char *)src;
+    while (pr2two[*(bufin++)] != 16 && count)
+        count--;
+    nprbytes = (bufin - (const unsigned char *)src) - 1;
+    while (pr2two[*(bufin++)] > 16 && count)
+        count--;
+
+    status = flags & APR_ENCODE_RELAXED ? APR_SUCCESS :
+        count ? APR_BADCH : APR_SUCCESS;
+
+    if (dest) {
+
+        bufout = (unsigned char *)dest;
+        bufin = (const unsigned char *)src;
+
+        while (nprbytes >= 2) {
+            if (pr2two[bufin[0]] > 16) {
+                bufin += 1;
+                nprbytes -= 1;
+            }
+            else {
+                *(bufout++) = (unsigned char)ENCODE_TO_NATIVE(
+                                  pr2two[bufin[0]] << 4 | pr2two[bufin[1]]);
+                bufin += 2;
+                nprbytes -= 2;
+            }
+        }
+
+        if (nprbytes == 1) {
+            status = APR_BADCH;
+        }
+
+        if (len) {
+            *len = bufout - (unsigned char *)dest;
+        }
+
+        *(bufout++) = 0;
+
+        return status;
+    }
+
+    else {
+
+        count = 0;
+        bufin = (const unsigned char *)src;
+
+        while (nprbytes >= 2) {
+            if (pr2two[bufin[0]] > 16) {
+                bufin += 1;
+                nprbytes -= 1;
+            }
+            else {
+                count++;
+                bufin += 2;
+                nprbytes -= 2;
+            }
+        }
+
+        if (nprbytes == 1) {
+            status = APR_BADCH;
+        }
+
+        if (len) {
+            *len = count + 1;
+        }
+
+        return status;
+    }
+
+}
+
+APR_DECLARE(apr_status_t) apr_decode_base16_binary(unsigned char *dest,
+             const char *src, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    register const unsigned char *bufin;
+    register unsigned char *bufout;
+    register apr_size_t nprbytes;
+    register apr_size_t count;
+
+    apr_status_t status;
+
+    if (!src) {
+        return APR_NOTFOUND;
+    }
+
+    if (APR_ENCODE_STRING == slen) {
+        slen = strlen(src);
+    }
+
+    count = slen;
+    bufin = (const unsigned char *)src;
+    while (pr2two[*(bufin++)] != 16 && count)
+        count--;
+    nprbytes = (bufin - (const unsigned char *)src) - 1;
+    while (pr2two[*(bufin++)] > 16 && count)
+        count--;
+
+    status = flags & APR_ENCODE_RELAXED ? APR_SUCCESS :
+        count ? APR_BADCH : APR_SUCCESS;
+
+    if (dest) {
+
+        bufout = (unsigned char *)dest;
+        bufin = (const unsigned char *)src;
+
+        while (nprbytes >= 2) {
+            if (pr2two[bufin[0]] > 16) {
+                bufin += 1;
+                nprbytes -= 1;
+            }
+            else {
+                *(bufout++) = (unsigned char)(
+                                  pr2two[bufin[0]] << 4 | pr2two[bufin[1]]);
+                bufin += 2;
+                nprbytes -= 2;
+            }
+        }
+
+        if (nprbytes == 1) {
+            status = APR_BADCH;
+        }
+
+        if (len) {
+            *len = bufout - (unsigned char *)dest;
+        }
+
+        return status;
+    }
+
+    else {
+
+        count = 0;
+        bufin = (const unsigned char *)src;
+
+        while (nprbytes >= 2) {
+            if (pr2two[bufin[0]] > 16) {
+                bufin += 1;
+                nprbytes -= 1;
+            }
+            else {
+                count++;
+                bufin += 2;
+                nprbytes -= 2;
+            }
+        }
+
+        if (nprbytes == 1) {
+            status = APR_BADCH;
+        }
+
+        if (len) {
+            *len = count;
+        }
+
+        return status;
+    }
+}
+
+APR_DECLARE(const char *)apr_pdecode_base16(apr_pool_t * p,
+             const char *str, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_decode_base16(NULL, str, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            void *cmd = apr_palloc(p, size);
+            apr_decode_base16(cmd, str, slen, flags, len);
+            return cmd;
+        }
+    case APR_BADCH:
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}
+
+APR_DECLARE(const unsigned char *)apr_pdecode_base16_binary(apr_pool_t * p,
+             const char *str, apr_ssize_t slen, int flags, apr_size_t * len)
+{
+    apr_size_t size;
+
+    switch (apr_decode_base16_binary(NULL, str, slen, flags, &size)) {
+    case APR_SUCCESS:{
+            unsigned char *cmd = apr_palloc(p, size + 1);
+            cmd[size] = 0;
+            apr_decode_base16_binary(cmd, str, slen, flags, len);
+            return cmd;
+        }
+    case APR_BADCH:
+    case APR_NOTFOUND:{
+            break;
+        }
+    }
+
+    return NULL;
+}

Property changes on: head/contrib/apr/encoding/apr_encode.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/apr/encoding/apr_escape.c
===================================================================
--- head/contrib/apr/encoding/apr_escape.c	(revision 361677)
+++ head/contrib/apr/encoding/apr_escape.c	(revision 361678)
@@ -1,1183 +1,1214 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 /* escape/unescape functions.
  *
  * These functions perform various escaping operations, and are provided in
  * pairs, a function to query the length of and escape existing buffers, as
  * well as companion functions to perform the same process to memory
  * allocated from a pool.
  *
  * The API is designed to have the smallest possible RAM footprint, and so
  * will only allocate the exact amount of RAM needed for each conversion.
  */
 
 #include "apr_escape.h"
 #include "apr_escape_test_char.h"
+#include "apr_encode_private.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
 
-#if APR_CHARSET_EBCDIC
-static int convert_a2e[256] = {
-  0x00, 0x01, 0x02, 0x03, 0x37, 0x2D, 0x2E, 0x2F, 0x16, 0x05, 0x15, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-  0x10, 0x11, 0x12, 0x13, 0x3C, 0x3D, 0x32, 0x26, 0x18, 0x19, 0x3F, 0x27, 0x1C, 0x1D, 0x1E, 0x1F,
-  0x40, 0x5A, 0x7F, 0x7B, 0x5B, 0x6C, 0x50, 0x7D, 0x4D, 0x5D, 0x5C, 0x4E, 0x6B, 0x60, 0x4B, 0x61,
-  0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0x7A, 0x5E, 0x4C, 0x7E, 0x6E, 0x6F,
-  0x7C, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6,
-  0xD7, 0xD8, 0xD9, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xAD, 0xE0, 0xBD, 0x5F, 0x6D,
-  0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
-  0x97, 0x98, 0x99, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xC0, 0x4F, 0xD0, 0xA1, 0x07,
-  0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x06, 0x17, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x09, 0x0A, 0x1B,
-  0x30, 0x31, 0x1A, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3A, 0x3B, 0x04, 0x14, 0x3E, 0xFF,
-  0x41, 0xAA, 0x4A, 0xB1, 0x9F, 0xB2, 0x6A, 0xB5, 0xBB, 0xB4, 0x9A, 0x8A, 0xB0, 0xCA, 0xAF, 0xBC,
-  0x90, 0x8F, 0xEA, 0xFA, 0xBE, 0xA0, 0xB6, 0xB3, 0x9D, 0xDA, 0x9B, 0x8B, 0xB7, 0xB8, 0xB9, 0xAB,
-  0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9E, 0x68, 0x74, 0x71, 0x72, 0x73, 0x78, 0x75, 0x76, 0x77,
-  0xAC, 0x69, 0xED, 0xEE, 0xEB, 0xEF, 0xEC, 0xBF, 0x80, 0xFD, 0xFE, 0xFB, 0xFC, 0xBA, 0xAE, 0x59,
-  0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9C, 0x48, 0x54, 0x51, 0x52, 0x53, 0x58, 0x55, 0x56, 0x57,
-  0x8C, 0x49, 0xCD, 0xCE, 0xCB, 0xCF, 0xCC, 0xE1, 0x70, 0xDD, 0xDE, 0xDB, 0xDC, 0x8D, 0x8E, 0xDF };
-
-static int convert_e2a[256] = {
-  0x00, 0x01, 0x02, 0x03, 0x9C, 0x09, 0x86, 0x7F, 0x97, 0x8D, 0x8E, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-  0x10, 0x11, 0x12, 0x13, 0x9D, 0x0A, 0x08, 0x87, 0x18, 0x19, 0x92, 0x8F, 0x1C, 0x1D, 0x1E, 0x1F,
-  0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x17, 0x1B, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x05, 0x06, 0x07,
-  0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, 0x98, 0x99, 0x9A, 0x9B, 0x14, 0x15, 0x9E, 0x1A,
-  0x20, 0xA0, 0xE2, 0xE4, 0xE0, 0xE1, 0xE3, 0xE5, 0xE7, 0xF1, 0xA2, 0x2E, 0x3C, 0x28, 0x2B, 0x7C,
-  0x26, 0xE9, 0xEA, 0xEB, 0xE8, 0xED, 0xEE, 0xEF, 0xEC, 0xDF, 0x21, 0x24, 0x2A, 0x29, 0x3B, 0x5E,
-  0x2D, 0x2F, 0xC2, 0xC4, 0xC0, 0xC1, 0xC3, 0xC5, 0xC7, 0xD1, 0xA6, 0x2C, 0x25, 0x5F, 0x3E, 0x3F,
-  0xF8, 0xC9, 0xCA, 0xCB, 0xC8, 0xCD, 0xCE, 0xCF, 0xCC, 0x60, 0x3A, 0x23, 0x40, 0x27, 0x3D, 0x22,
-  0xD8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0xAB, 0xBB, 0xF0, 0xFD, 0xFE, 0xB1,
-  0xB0, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0xAA, 0xBA, 0xE6, 0xB8, 0xC6, 0xA4,
-  0xB5, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0xA1, 0xBF, 0xD0, 0x5B, 0xDE, 0xAE,
-  0xAC, 0xA3, 0xA5, 0xB7, 0xA9, 0xA7, 0xB6, 0xBC, 0xBD, 0xBE, 0xDD, 0xA8, 0xAF, 0x5D, 0xB4, 0xD7,
-  0x7B, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0xAD, 0xF4, 0xF6, 0xF2, 0xF3, 0xF5,
-  0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0xB9, 0xFB, 0xFC, 0xF9, 0xFA, 0xFF,
-  0x5C, 0xF7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0xB2, 0xD4, 0xD6, 0xD2, 0xD3, 0xD5,
-  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0xB3, 0xDB, 0xDC, 0xD9, 0xDA, 0x9F };
-#define RAW_ASCII_CHAR(ch)  convert_e2a[(unsigned char)ch]
-#else /* APR_CHARSET_EBCDIC */
-#define RAW_ASCII_CHAR(ch)  (ch)
-#endif /* !APR_CHARSET_EBCDIC */
-
 /* we assume the folks using this ensure 0 <= c < 256... which means
  * you need a cast to (unsigned char) first, you can't just plug a
  * char in here and get it to work, because if char is signed then it
  * will first be sign extended.
  */
 #define TEST_CHAR(c, f)        (test_char_table[(unsigned)(c)] & (f))
 
 APR_DECLARE(apr_status_t) apr_escape_shell(char *escaped, const char *str,
         apr_ssize_t slen, apr_size_t *len)
 {
     unsigned char *d;
     const unsigned char *s;
     apr_size_t size = 1;
     int found = 0;
 
     d = (unsigned char *) escaped;
     s = (const unsigned char *) str;
 
     if (s) {
         if (d) {
             for (; *s && slen; ++s, slen--) {
 #if defined(OS2) || defined(WIN32)
                 /*
                  * 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') {
                     if (d) {
                         *d++ = ' ';
                         found = 1;
                     }
                     continue;
                 }
 #endif
                 if (TEST_CHAR(*s, T_ESCAPE_SHELL_CMD)) {
                     *d++ = '\\';
                     size++;
                     found = 1;
                 }
                 *d++ = *s;
                 size++;
             }
             *d = '\0';
         }
         else {
             for (; *s && slen; ++s, slen--) {
                 if (TEST_CHAR(*s, T_ESCAPE_SHELL_CMD)) {
                     size++;
                     found = 1;
                 }
                 size++;
             }
         }
     }
 
     if (len) {
         *len = size;
     }
     if (!found) {
         return APR_NOTFOUND;
     }
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const char *) apr_pescape_shell(apr_pool_t *p, const char *str)
 {
     apr_size_t len;
 
     switch (apr_escape_shell(NULL, str, APR_ESCAPE_STRING, &len)) {
     case APR_SUCCESS: {
         char *cmd = apr_palloc(p, len);
         apr_escape_shell(cmd, str, APR_ESCAPE_STRING, NULL);
         return cmd;
     }
     case APR_NOTFOUND: {
         break;
     }
     }
 
     return str;
 }
 
 static char x2c(const char *what)
 {
     register char digit;
 
 #if !APR_CHARSET_EBCDIC
     digit =
             ((what[0] >= 'A') ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0'));
     digit *= 16;
     digit += (what[1] >= 'A' ? ((what[1] & 0xdf) - 'A') + 10 : (what[1] - '0'));
 #else /*APR_CHARSET_EBCDIC*/
     char xstr[5];
     xstr[0]='0';
     xstr[1]='x';
     xstr[2]=what[0];
     xstr[3]=what[1];
     xstr[4]='\0';
-    digit = convert_a2e[0xFF & strtol(xstr, NULL, 16)];
+    digit = ENCODE_TO_NATIVE[0xFF & strtol(xstr, NULL, 16)];
 #endif /*APR_CHARSET_EBCDIC*/
     return (digit);
 }
 
 APR_DECLARE(apr_status_t) apr_unescape_url(char *escaped, const char *url,
         apr_ssize_t slen, const char *forbid, const char *reserved, int plus,
         apr_size_t *len)
 {
     apr_size_t size = 1;
     int found = 0;
     const char *s = (const char *) url;
     char *d = (char *) escaped;
     register int badesc, badpath;
 
     if (!url) {
         return APR_NOTFOUND;
     }
 
     badesc = 0;
     badpath = 0;
     if (s) {
         if (d) {
             for (; *s && slen; ++s, d++, slen--) {
                 if (plus && *s == '+') {
                     *d = ' ';
                     found = 1;
                 }
                 else if (*s != '%') {
                     *d = *s;
                 }
                 else {
                     if (!apr_isxdigit(*(s + 1)) || !apr_isxdigit(*(s + 2))) {
                         badesc = 1;
                         *d = '%';
                     }
                     else {
                         char decoded;
                         decoded = x2c(s + 1);
                         if ((decoded == '\0')
                                 || (forbid && strchr(forbid, decoded))) {
                             badpath = 1;
                             *d = decoded;
                             s += 2;
                             slen -= 2;
                         }
                         else if (reserved && strchr(reserved, decoded)) {
                             *d++ = *s++;
                             *d++ = *s++;
                             *d = *s;
                             size += 2;
                         }
                         else {
                             *d = decoded;
                             s += 2;
                             slen -= 2;
                             found = 1;
                         }
                     }
                 }
                 size++;
             }
             *d = '\0';
         }
         else {
             for (; *s && slen; ++s, slen--) {
                 if (plus && *s == '+') {
                     found = 1;
                 }
                 else if (*s != '%') {
                     /* character unchanged */
                 }
                 else {
                     if (!apr_isxdigit(*(s + 1)) || !apr_isxdigit(*(s + 2))) {
                         badesc = 1;
                     }
                     else {
                         char decoded;
                         decoded = x2c(s + 1);
                         if ((decoded == '\0')
                                 || (forbid && strchr(forbid, decoded))) {
                             badpath = 1;
                             s += 2;
                             slen -= 2;
                         }
                         else if (reserved && strchr(reserved, decoded)) {
                             s += 2;
                             slen -= 2;
                             size += 2;
                         }
                         else {
                             s += 2;
                             slen -= 2;
                             found = 1;
                         }
                     }
                 }
                 size++;
             }
         }
     }
 
     if (len) {
         *len = size;
     }
     if (badesc) {
         return APR_EINVAL;
     }
     else if (badpath) {
         return APR_BADCH;
     }
     else if (!found) {
         return APR_NOTFOUND;
     }
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const char *) apr_punescape_url(apr_pool_t *p, const char *url,
         const char *forbid, const char *reserved, int plus)
 {
     apr_size_t len;
 
     switch (apr_unescape_url(NULL, url, APR_ESCAPE_STRING, forbid, reserved,
             plus, &len)) {
     case APR_SUCCESS: {
         char *buf = apr_palloc(p, len);
         apr_unescape_url(buf, url, APR_ESCAPE_STRING, forbid, reserved, plus,
                 NULL);
         return buf;
     }
     case APR_EINVAL:
     case APR_BADCH: {
         return NULL;
     }
     case APR_NOTFOUND: {
         break;
     }
     }
 
     return url;
 }
 
 /* c2x takes an unsigned, and expects the caller has guaranteed that
  * 0 <= what < 256... which usually means that you have to cast to
  * unsigned char first, because (unsigned)(char)(x) first goes through
  * signed extension to an int before the unsigned cast.
  *
  * The reason for this assumption is to assist gcc code generation --
  * the unsigned char -> unsigned extension is already done earlier in
  * both uses of this code, so there's no need to waste time doing it
  * again.
  */
 static const char c2x_table[] = "0123456789abcdef";
 
 static APR_INLINE unsigned char *c2x(unsigned what, unsigned char prefix,
         unsigned char *where)
 {
 #if APR_CHARSET_EBCDIC
     what = convert_e2a[(unsigned char)what];
 #endif /*APR_CHARSET_EBCDIC*/
     *where++ = prefix;
     *where++ = c2x_table[what >> 4];
     *where++ = c2x_table[what & 0xf];
     return where;
 }
 
 APR_DECLARE(apr_status_t) apr_escape_path_segment(char *escaped,
         const char *str, apr_ssize_t slen, apr_size_t *len)
 {
     apr_size_t size = 1;
     int found = 0;
     const unsigned char *s = (const unsigned char *) str;
     unsigned char *d = (unsigned char *) escaped;
     unsigned c;
 
     if (s) {
         if (d) {
             while ((c = *s) && slen) {
                 if (TEST_CHAR(c, T_ESCAPE_PATH_SEGMENT)) {
                     d = c2x(c, '%', d);
                     size += 2;
                     found = 1;
                 }
                 else {
                     *d++ = c;
                 }
                 ++s;
                 size++;
                 slen--;
             }
             *d = '\0';
         }
         else {
             while ((c = *s) && slen) {
                 if (TEST_CHAR(c, T_ESCAPE_PATH_SEGMENT)) {
                     size += 2;
                     found = 1;
                 }
                 ++s;
                 size++;
                 slen--;
             }
         }
     }
 
     if (len) {
         *len = size;
     }
     if (!found) {
         return APR_NOTFOUND;
     }
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const char *) apr_pescape_path_segment(apr_pool_t *p,
         const char *str)
 {
     apr_size_t len;
 
     switch (apr_escape_path_segment(NULL, str, APR_ESCAPE_STRING, &len)) {
     case APR_SUCCESS: {
         char *cmd = apr_palloc(p, len);
         apr_escape_path_segment(cmd, str, APR_ESCAPE_STRING, NULL);
         return cmd;
     }
     case APR_NOTFOUND: {
         break;
     }
     }
 
     return str;
 }
 
 APR_DECLARE(apr_status_t) apr_escape_path(char *escaped, const char *path,
         apr_ssize_t slen, int partial, apr_size_t *len)
 {
     apr_size_t size = 1;
     int found = 0;
     const unsigned char *s = (const unsigned char *) path;
     unsigned char *d = (unsigned char *) escaped;
     unsigned c;
 
     if (!path) {
         return APR_NOTFOUND;
     }
 
     if (!partial) {
         const char *colon = strchr(path, ':');
         const char *slash = strchr(path, '/');
 
         if (colon && (!slash || colon < slash)) {
             if (d) {
                 *d++ = '.';
                 *d++ = '/';
             }
             size += 2;
             found = 1;
         }
     }
     if (d) {
         while ((c = *s) && slen) {
             if (TEST_CHAR(c, T_OS_ESCAPE_PATH)) {
                 d = c2x(c, '%', d);
                 size += 2;
                 found = 1;
             }
             else {
                 *d++ = c;
             }
             ++s;
             size++;
             slen--;
         }
         *d = '\0';
     }
     else {
         while ((c = *s) && slen) {
             if (TEST_CHAR(c, T_OS_ESCAPE_PATH)) {
                 size += 2;
                 found = 1;
             }
             ++s;
             size++;
             slen--;
         }
     }
 
     if (len) {
         *len = size;
     }
     if (!found) {
         return APR_NOTFOUND;
     }
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const char *) apr_pescape_path(apr_pool_t *p, const char *str,
         int partial)
 {
     apr_size_t len;
 
     switch (apr_escape_path(NULL, str, APR_ESCAPE_STRING, partial, &len)) {
     case APR_SUCCESS: {
         char *path = apr_palloc(p, len);
         apr_escape_path(path, str, APR_ESCAPE_STRING, partial, NULL);
         return path;
     }
     case APR_NOTFOUND: {
         break;
     }
     }
 
     return str;
 }
 
 APR_DECLARE(apr_status_t) apr_escape_urlencoded(char *escaped, const char *str,
         apr_ssize_t slen, apr_size_t *len)
 {
     apr_size_t size = 1;
     int found = 0;
     const unsigned char *s = (const unsigned char *) str;
     unsigned char *d = (unsigned char *) escaped;
     unsigned c;
 
     if (s) {
         if (d) {
             while ((c = *s) && slen) {
                 if (TEST_CHAR(c, T_ESCAPE_URLENCODED)) {
                     d = c2x(c, '%', d);
                     size += 2;
                     found = 1;
                 }
                 else if (c == ' ') {
                     *d++ = '+';
                     found = 1;
                 }
                 else {
                     *d++ = c;
                 }
                 ++s;
                 size++;
                 slen--;
             }
             *d = '\0';
         }
         else {
             while ((c = *s) && slen) {
                 if (TEST_CHAR(c, T_ESCAPE_URLENCODED)) {
                     size += 2;
                     found = 1;
                 }
                 else if (c == ' ') {
                     found = 1;
                 }
                 ++s;
                 size++;
                 slen--;
             }
         }
     }
 
     if (len) {
         *len = size;
     }
     if (!found) {
         return APR_NOTFOUND;
     }
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const char *) apr_pescape_urlencoded(apr_pool_t *p, const char *str)
 {
     apr_size_t len;
 
     switch (apr_escape_urlencoded(NULL, str, APR_ESCAPE_STRING, &len)) {
     case APR_SUCCESS: {
         char *encoded = apr_palloc(p, len);
         apr_escape_urlencoded(encoded, str, APR_ESCAPE_STRING, NULL);
         return encoded;
     }
     case APR_NOTFOUND: {
         break;
     }
     }
 
     return str;
 }
 
 APR_DECLARE(apr_status_t) apr_escape_entity(char *escaped, const char *str,
         apr_ssize_t slen, int toasc, apr_size_t *len)
 {
     apr_size_t size = 1;
     int found = 0;
     const unsigned char *s = (const unsigned char *) str;
     unsigned char *d = (unsigned char *) escaped;
     unsigned c;
 
     if (s) {
         if (d) {
             while ((c = *s) && slen) {
                 if (TEST_CHAR(c, T_ESCAPE_XML)) {
                     switch (c) {
                     case '>': {
                         memcpy(d, "&gt;", 4);
                         size += 4;
                         d += 4;
                         break;
                     }
                     case '<': {
                         memcpy(d, "&lt;", 4);
                         size += 4;
                         d += 4;
                         break;
                     }
                     case '&': {
                         memcpy(d, "&amp;", 5);
                         size += 5;
                         d += 5;
                         break;
                     }
                     case '\"': {
                         memcpy(d, "&quot;", 6);
                         size += 6;
                         d += 6;
                         break;
                     }
                     case '\'': {
                         memcpy(d, "&apos;", 6);
                         size += 6;
                         d += 6;
                         break;
                     }
                     }
                     found = 1;
                 }
                 else if (toasc && !apr_isascii(c)) {
                     int offset = apr_snprintf((char *) d, 6, "&#%3.3d;", c);
                     size += offset;
                     d += offset;
                     found = 1;
                 }
                 else {
                     *d++ = c;
                     size++;
                 }
                 ++s;
                 slen--;
             }
             *d = '\0';
         }
         else {
             while ((c = *s) && slen) {
                 if (TEST_CHAR(c, T_ESCAPE_XML)) {
                     switch (c) {
                     case '>': {
                         size += 4;
                         break;
                     }
                     case '<': {
                         size += 4;
                         break;
                     }
                     case '&': {
                         size += 5;
                         break;
                     }
                     case '\"': {
                         size += 6;
                         break;
                     }
                     case '\'': {
                         size += 6;
                         break;
                     }
                     }
                     found = 1;
                 }
                 else if (toasc && !apr_isascii(c)) {
                     char buf[8];
                     size += apr_snprintf(buf, 6, "&#%3.3d;", c);
                     found = 1;
                 }
                 else {
                     size++;
                 }
                 ++s;
                 slen--;
             }
         }
     }
 
     if (len) {
         *len = size;
     }
     if (!found) {
         return APR_NOTFOUND;
     }
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const char *) apr_pescape_entity(apr_pool_t *p, const char *str,
         int toasc)
 {
     apr_size_t len;
 
     switch (apr_escape_entity(NULL, str, APR_ESCAPE_STRING, toasc, &len)) {
     case APR_SUCCESS: {
         char *cmd = apr_palloc(p, len);
         apr_escape_entity(cmd, str, APR_ESCAPE_STRING, toasc, NULL);
         return cmd;
     }
     case APR_NOTFOUND: {
         break;
     }
     }
 
     return str;
 }
 
 /* maximum length of any ISO-LATIN-1 HTML entity name. */
 #define MAXENTLEN (6)
 
 APR_DECLARE(apr_status_t) apr_unescape_entity(char *unescaped, const char *str,
         apr_ssize_t slen, apr_size_t *len)
 {
     int found = 0;
     apr_size_t size = 1;
     int val, i, j;
     char *d = unescaped;
     const char *s = str;
     const char *ents;
     static const char * const entlist[MAXENTLEN + 1] =
     {
             NULL, /* 0 */
             NULL, /* 1 */
             "lt\074gt\076", /* 2 */
             "amp\046ETH\320eth\360", /* 3 */
             "quot\042Auml\304Euml\313Iuml\317Ouml\326Uuml\334auml\344euml"
             "\353iuml\357ouml\366uuml\374yuml\377", /* 4 */
             "Acirc\302Aring\305AElig\306Ecirc\312Icirc\316Ocirc\324Ucirc"
             "\333THORN\336szlig\337acirc\342aring\345aelig\346ecirc\352"
             "icirc\356ocirc\364ucirc\373thorn\376", /* 5 */
             "Agrave\300Aacute\301Atilde\303Ccedil\307Egrave\310Eacute\311"
             "Igrave\314Iacute\315Ntilde\321Ograve\322Oacute\323Otilde"
             "\325Oslash\330Ugrave\331Uacute\332Yacute\335agrave\340"
             "aacute\341atilde\343ccedil\347egrave\350eacute\351igrave"
             "\354iacute\355ntilde\361ograve\362oacute\363otilde\365"
             "oslash\370ugrave\371uacute\372yacute\375" /* 6 */
     };
 
     if (s) {
         if (d) {
             for (; *s != '\0' && slen; s++, d++, size++, slen--) {
                 if (*s != '&') {
                     *d = *s;
                     continue;
                 }
                 /* find end of entity */
                 for (i = 1; s[i] != ';' && s[i] != '\0' && (slen - i) != 0;
                         i++) {
                     continue;
                 }
 
                 if (s[i] == '\0' || (slen - i) == 0) { /* treat as normal data */
                     *d = *s;
                     continue;
                 }
 
                 /* is it numeric ? */
                 if (s[1] == '#') {
                     for (j = 2, val = 0; j < i && apr_isdigit(s[j]); j++) {
                         val = val * 10 + s[j] - '0';
                     }
                     s += i;
                     if (j < i || val <= 8 || (val >= 11 && val <= 31)
                             || (val >= 127 && val <= 160) || val >= 256) {
                         d--; /* no data to output */
                         size--;
                     }
                     else {
-                        *d = RAW_ASCII_CHAR(val);
+                        *d = ENCODE_TO_ASCII(val);
                         found = 1;
                     }
                 }
                 else {
                     j = i - 1;
                     if (j > MAXENTLEN || entlist[j] == NULL) {
                         /* wrong length */
                         *d = '&';
                         continue; /* skip it */
                     }
                     for (ents = entlist[j]; *ents != '\0'; ents += i) {
                         if (strncmp(s + 1, ents, j) == 0) {
                             break;
                         }
                     }
 
                     if (*ents == '\0') {
                         *d = '&'; /* unknown */
                     }
                     else {
-                        *d = RAW_ASCII_CHAR(((const unsigned char *) ents)[j]);
+                        *d = ENCODE_TO_ASCII(((const unsigned char *) ents)[j]);
                         s += i;
                         slen -= i;
                         found = 1;
                     }
                 }
             }
             *d = '\0';
         }
         else {
             for (; *s != '\0' && slen; s++, size++, slen--) {
                 if (*s != '&') {
                     continue;
                 }
                 /* find end of entity */
                 for (i = 1; s[i] != ';' && s[i] != '\0' && (slen - i) != 0;
                         i++) {
                     continue;
                 }
 
                 if (s[i] == '\0' || (slen - i) == 0) { /* treat as normal data */
                     continue;
                 }
 
                 /* is it numeric ? */
                 if (s[1] == '#') {
                     for (j = 2, val = 0; j < i && apr_isdigit(s[j]); j++) {
                         val = val * 10 + s[j] - '0';
                     }
                     s += i;
                     if (j < i || val <= 8 || (val >= 11 && val <= 31)
                             || (val >= 127 && val <= 160) || val >= 256) {
                         /* no data to output */
                         size--;
                     }
                     else {
                         found = 1;
                     }
                 }
                 else {
                     j = i - 1;
                     if (j > MAXENTLEN || entlist[j] == NULL) {
                         /* wrong length */
                         continue; /* skip it */
                     }
                     for (ents = entlist[j]; *ents != '\0'; ents += i) {
                         if (strncmp(s + 1, ents, j) == 0) {
                             break;
                         }
                     }
 
                     if (*ents == '\0') {
                         /* unknown */
                     }
                     else {
                         s += i;
                         slen -= i;
                         found = 1;
                     }
                 }
             }
         }
     }
 
     if (len) {
         *len = size;
     }
     if (!found) {
         return APR_NOTFOUND;
     }
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const char *) apr_punescape_entity(apr_pool_t *p, const char *str)
 {
     apr_size_t len;
 
     switch (apr_unescape_entity(NULL, str, APR_ESCAPE_STRING, &len)) {
     case APR_SUCCESS: {
         char *cmd = apr_palloc(p, len);
         apr_unescape_entity(cmd, str, APR_ESCAPE_STRING, NULL);
         return cmd;
     }
     case APR_NOTFOUND: {
         break;
     }
     }
 
     return str;
 }
 
 APR_DECLARE(apr_status_t) apr_escape_echo(char *escaped, const char *str,
         apr_ssize_t slen, int quote, apr_size_t *len)
 {
     apr_size_t size = 1;
     int found = 0;
     const unsigned char *s = (const unsigned char *) str;
     unsigned char *d = (unsigned char *) escaped;
     unsigned c;
 
     if (s) {
         if (d) {
             while ((c = *s) && slen) {
                 if (TEST_CHAR(c, T_ESCAPE_ECHO)) {
                     *d++ = '\\';
                     size++;
                     switch (c) {
                     case '\a':
                         *d++ = 'a';
                         size++;
                         found = 1;
                         break;
                     case '\b':
                         *d++ = 'b';
                         size++;
                         found = 1;
                         break;
                     case '\f':
                         *d++ = 'f';
                         size++;
                         found = 1;
                         break;
                     case '\n':
                         *d++ = 'n';
                         size++;
                         found = 1;
                         break;
                     case '\r':
                         *d++ = 'r';
                         size++;
                         found = 1;
                         break;
                     case '\t':
                         *d++ = 't';
                         size++;
                         found = 1;
                         break;
                     case '\v':
                         *d++ = 'v';
                         size++;
                         found = 1;
                         break;
                     case '\\':
                         *d++ = '\\';
                         size++;
                         found = 1;
                         break;
                     case '"':
                         if (quote) {
                             *d++ = c;
                             size++;
                             found = 1;
                         }
                         else {
                             d[-1] = c;
                         }
                         break;
                     default:
                         c2x(c, 'x', d);
                         d += 3;
                         size += 3;
                         found = 1;
                         break;
                     }
                 }
                 else {
                     *d++ = c;
                     size++;
                 }
                 ++s;
                 slen--;
             }
             *d = '\0';
         }
         else {
             while ((c = *s) && slen) {
                 if (TEST_CHAR(c, T_ESCAPE_ECHO)) {
                     size++;
                     switch (c) {
                     case '\a':
                     case '\b':
                     case '\f':
                     case '\n':
                     case '\r':
                     case '\t':
                     case '\v':
                     case '\\':
                         size++;
                         found = 1;
                         break;
                     case '"':
                         if (quote) {
                             size++;
                             found = 1;
                         }
                         break;
                     default:
                         size += 3;
                         found = 1;
                         break;
                     }
                 }
                 else {
                     size++;
                 }
                 ++s;
                 slen--;
             }
         }
     }
 
     if (len) {
         *len = size;
     }
     if (!found) {
         return APR_NOTFOUND;
     }
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const char *) apr_pescape_echo(apr_pool_t *p, const char *str,
         int quote)
 {
     apr_size_t len;
 
     switch (apr_escape_echo(NULL, str, APR_ESCAPE_STRING, quote, &len)) {
     case APR_SUCCESS: {
         char *cmd = apr_palloc(p, len);
         apr_escape_echo(cmd, str, APR_ESCAPE_STRING, quote, NULL);
         return cmd;
     }
     case APR_NOTFOUND: {
         break;
     }
     }
 
     return str;
 }
 
 APR_DECLARE(apr_status_t) apr_escape_hex(char *dest, const void *src,
         apr_size_t srclen, int colon, apr_size_t *len)
 {
     const unsigned char *in = src;
     apr_size_t size;
 
     if (!src) {
         return APR_NOTFOUND;
     }
 
     if (dest) {
         for (size = 0; size < srclen; size++) {
             if (colon && size) {
                 *dest++ = ':';
             }
             *dest++ = c2x_table[in[size] >> 4];
             *dest++ = c2x_table[in[size] & 0xf];
         }
         *dest = '\0';
     }
 
     if (len) {
         if (colon && srclen) {
             *len = srclen * 3;
         }
         else {
             *len = srclen * 2 + 1;
         }
     }
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const char *) apr_pescape_hex(apr_pool_t *p, const void *src,
         apr_size_t srclen, int colon)
 {
     apr_size_t len;
 
     switch (apr_escape_hex(NULL, src, srclen, colon, &len)) {
     case APR_SUCCESS: {
         char *cmd = apr_palloc(p, len);
         apr_escape_hex(cmd, src, srclen, colon, NULL);
         return cmd;
     }
     case APR_NOTFOUND: {
         break;
     }
     }
 
     return src;
 }
 
 APR_DECLARE(apr_status_t) apr_unescape_hex(void *dest, const char *str,
         apr_ssize_t slen, int colon, apr_size_t *len)
 {
     apr_size_t size = 0;
     int flip = 0;
     const unsigned char *s = (const unsigned char *) str;
     unsigned char *d = (unsigned char *) dest;
     unsigned c;
     unsigned char u = 0;
 
     if (s) {
         if (d) {
             while ((c = *s) && slen) {
 
                 if (!flip) {
                     u = 0;
                 }
 
                 if (colon && c == ':' && !flip) {
                     ++s;
                     slen--;
                     continue;
                 }
                 else if (apr_isdigit(c)) {
                     u |= c - '0';
                 }
                 else if (apr_isupper(c) && c <= 'F') {
                     u |= c - ('A' - 10);
                 }
                 else if (apr_islower(c) && c <= 'f') {
                     u |= c - ('a' - 10);
                 }
                 else {
                     return APR_BADCH;
                 }
 
                 if (flip) {
                     *d++ = u;
                     size++;
                 }
                 else {
                     u <<= 4;
                     *d = u;
                 }
                 flip = !flip;
 
                 ++s;
                 slen--;
             }
         }
         else {
             while ((c = *s) && slen) {
 
                 if (colon && c == ':' && !flip) {
                     ++s;
                     slen--;
                     continue;
                 }
                 else if (apr_isdigit(c)) {
                     /* valid */
                 }
                 else if (apr_isupper(c) && c <= 'F') {
                     /* valid */
                 }
                 else if (apr_islower(c) && c <= 'f') {
                     /* valid */
                 }
                 else {
                     return APR_BADCH;
                 }
 
                 if (flip) {
                     size++;
                 }
                 flip = !flip;
 
                 ++s;
                 slen--;
             }
         }
     }
 
     if (len) {
         *len = size;
     }
     if (!s) {
         return APR_NOTFOUND;
     }
 
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const void *) apr_punescape_hex(apr_pool_t *p, const char *str,
         int colon, apr_size_t *len)
 {
     apr_size_t size;
 
     switch (apr_unescape_hex(NULL, str, APR_ESCAPE_STRING, colon, &size)) {
     case APR_SUCCESS: {
         void *cmd = apr_palloc(p, size);
         apr_unescape_hex(cmd, str, APR_ESCAPE_STRING, colon, len);
         return cmd;
     }
     case APR_BADCH:
     case APR_NOTFOUND: {
         break;
     }
     }
 
     return NULL;
 }
+
+APR_DECLARE(apr_status_t) apr_escape_ldap(char *escaped, const void *str,
+        apr_ssize_t slen, int flags, apr_size_t *len)
+{
+    apr_size_t size = 1;
+    int found = 0;
+    const unsigned char *s = (const unsigned char *) str;
+    unsigned char *d = (unsigned char *) escaped;
+    unsigned c;
+
+    if (s) {
+        if (d) {
+            while (((c = *s) && slen) || (slen > 0)) {
+                if (((flags & APR_ESCAPE_LDAP_DN) && TEST_CHAR(c, T_ESCAPE_LDAP_DN))
+                     || ((flags & APR_ESCAPE_LDAP_FILTER) && TEST_CHAR(c, T_ESCAPE_LDAP_FILTER))) {
+                    d = c2x(c, '\\', d);
+                    size += 2;
+                    found = 1;
+                }
+                else {
+                    *d++ = c;
+                }
+                ++s;
+                size++;
+                slen--;
+            }
+            *d = '\0';
+        }
+        else {
+            while (((c = *s) && slen) || (slen > 0)) {
+                if (((flags & APR_ESCAPE_LDAP_DN) && TEST_CHAR(c, T_ESCAPE_LDAP_DN)) 
+                     || ((flags & APR_ESCAPE_LDAP_FILTER) && TEST_CHAR(c, T_ESCAPE_LDAP_FILTER))) {
+                    size += 2;
+                    found = 1;
+                }
+                ++s;
+                size++;
+                slen--;
+            }
+        }
+    }
+
+    if (len) {
+        *len = size;
+    }
+    if (!found) {
+        return APR_NOTFOUND;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(const char *) apr_pescape_ldap(apr_pool_t *p, const void *src,
+        apr_ssize_t srclen, int flags)
+{
+    apr_size_t len;
+
+    switch (apr_escape_ldap(NULL, src, srclen, flags, &len)) {
+    case APR_SUCCESS: {
+        char *encoded = apr_palloc(p, len);
+        apr_escape_ldap(encoded, src, srclen, flags, NULL);
+        return encoded;
+    }
+    case APR_NOTFOUND: {
+        break;
+    }
+    }
+
+    return src;
+}
+
Index: head/contrib/apr/file_io/unix/copy.c
===================================================================
--- head/contrib/apr/file_io/unix/copy.c	(revision 361677)
+++ head/contrib/apr/file_io/unix/copy.c	(revision 361678)
@@ -1,118 +1,119 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_finfo_t finfo;
     apr_fileperms_t perms;
 
     /* Open source file. */
     status = apr_file_open(&s, from_path, APR_FOPEN_READ, APR_OS_DEFAULT, pool);
     if (status)
         return status;
 
     /* Maybe get its permissions. */
     if (to_perms == APR_FILE_SOURCE_PERMS) {
         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;
+        apr_file_perms_set(to_path, perms); /* ignore any failure */
     }
     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_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_TRUNCATE),
                                       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_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_APPEND),
                                       perms,
                                       pool);
 }
Index: head/contrib/apr/file_io/unix/dir.c
===================================================================
--- head/contrib/apr/file_io/unix/dir.c	(revision 361677)
+++ head/contrib/apr/file_io/unix/dir.c	(revision 361678)
@@ -1,364 +1,373 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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
 
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#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) +
-        (sizeof((*new)->entry->d_name) > 1 ? 0 : 255);
     DIR *dir = opendir(dirname);
 
     if (!dir) {
         return errno;
     }
 
     (*new) = (apr_dir_t *)apr_palloc(pool, sizeof(apr_dir_t));
 
     (*new)->pool = pool;
     (*new)->dirname = apr_pstrdup(pool, dirname);
     (*new)->dirstruct = dir;
-    (*new)->entry = apr_pcalloc(pool, dirent_size);
+
+#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) \
+                    && !defined(READDIR_IS_THREAD_SAFE)
+    /* 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.
+     */
+    (*new)->entry = apr_pcalloc(pool, sizeof(*(*new)->entry) +
+                                      (sizeof((*new)->entry->d_name) > 1
+                                       ? 0 : NAME_MAX));
+#else
+    (*new)->entry = NULL;
+#endif
 
     apr_pool_cleanup_register((*new)->pool, *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)
 #ifdef APR_USE_READDIR64_R
     struct dirent64 *retent;
 
     /* If LFS is enabled and readdir64_r is available, readdir64_r is
      * used in preference to readdir_r.  This allows directories to be
      * read which contain a (64-bit) inode number which doesn't fit
      * into the 32-bit apr_ino_t, iff the caller doesn't actually care
      * about the inode number (i.e. wanted & APR_FINFO_INODE == 0).
      * (such inodes may be seen in some wonky NFS environments)
      *
      * Similarly, if the d_off field cannot be reprented in a 32-bit
      * offset, the libc readdir_r() would barf; using readdir64_r
      * bypasses that case entirely since APR does not care about
      * d_off. */
 
     ret = readdir64_r(thedir->dirstruct, thedir->entry, &retent);
 #else
 
     struct dirent *retent;
 
     ret = readdir_r(thedir->dirstruct, thedir->entry, &retent);
 #endif
 
     /* POSIX treats "end of directory" as a non-error case, so ret
      * will be zero and retent will be set to NULL in that case. */
     if (!ret && retent == NULL) {
         ret = APR_ENOENT;
     }
 
     /* Solaris is a bit strange, if there are no more entries in the
      * directory, it returns EINVAL.  Since this is against POSIX, we
      * 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 = APR_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) {
 #ifdef APR_USE_READDIR64_R
         /* If readdir64_r is used, check for the overflow case of trying
          * to fit a 64-bit integer into a 32-bit integer. */
         if (sizeof(apr_ino_t) >= sizeof(retent->DIRENT_INODE)
             || (apr_ino_t)retent->DIRENT_INODE == retent->DIRENT_INODE) {
             wanted &= ~APR_FINFO_INODE;
         } else {
             /* Prevent the fallback code below from filling in the
              * inode if the stat call fails. */
             retent->DIRENT_INODE = 0;
         }
 #else
         wanted &= ~APR_FINFO_INODE;
 #endif /* APR_USE_READDIR64_R */
     }
 #endif /* DIRENT_INODE */
 
     wanted &= ~APR_FINFO_NAME;
 
     if (wanted)
     {
         char fspec[APR_PATH_MAX];
         char *end;
 
         end = apr_cpystrn(fspec, thedir->dirname, sizeof fspec);
 
         if (end > fspec && end[-1] != '/' && (end < fspec + APR_PATH_MAX))
             *end++ = '/';
 
         apr_cpystrn(end, thedir->entry->d_name, 
                     sizeof fspec - (end - fspec));
 
         ret = apr_stat(finfo, fspec, APR_FINFO_LINK | wanted, thedir->pool);
         /* We passed a stack name that will disappear */
         finfo->fname = NULL;
     }
 
     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 == 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);
     }
 
     /*
      * It's OK if PATH exists. Timing issues can lead to the second
      * apr_dir_make being called on existing dir, therefore this check
      * has to come last.
      */
     if (APR_STATUS_IS_EEXIST(apr_err))
         return APR_SUCCESS;
 
     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;
 }
 
   
Index: head/contrib/apr/file_io/unix/flock.c
===================================================================
--- head/contrib/apr/file_io/unix/flock.c	(revision 361677)
+++ head/contrib/apr/file_io/unix/flock.c	(revision 361678)
@@ -1,120 +1,120 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_whence = SEEK_SET;  /* count l_start from start of file */
+        l.l_start = 0;          /* lock from start of file */
         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_whence = SEEK_SET;  /* count l_start from start of file */
+        l.l_start = 0;          /* lock from start of file */
         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;
 }
Index: head/contrib/apr/file_io/unix/pipe.c
===================================================================
--- head/contrib/apr/file_io/unix/pipe.c	(revision 361677)
+++ head/contrib/apr/file_io/unix/pipe.c	(revision 361678)
@@ -1,264 +1,292 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 defined(BEOS)
 #if !defined(BONE7)
 # define BEOS_BLOCKING 1
 #else
 # define BEOS_BLOCKING 0
 #endif
 #endif
 
 static apr_status_t pipeblock(apr_file_t *thepipe)
 {
 #if !defined(BEOS) || !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(O_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 !defined(BEOS) || !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(O_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_FOPEN_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);
     }
 #ifndef WAITIO_USES_POLL
     /* Start out with no pollset.  apr_wait_for_io_or_timeout() will
      * initialize the pollset if needed.
      */
     (*file)->pollset = NULL;
 #endif
     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)
+static apr_status_t file_pipe_create(apr_file_t **in, apr_file_t **out,
+        apr_pool_t *pool_in, apr_pool_t *pool_out)
 {
     int filedes[2];
 
     if (pipe(filedes) == -1) {
         return errno;
     }
     
-    (*in) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-    (*in)->pool = pool;
+    (*in) = (apr_file_t *)apr_pcalloc(pool_in, sizeof(apr_file_t));
+    (*in)->pool = pool_in;
     (*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
 #ifndef WAITIO_USES_POLL
     (*in)->pollset = NULL;
 #endif
-    (*out) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-    (*out)->pool = pool;
+    (*out) = (apr_file_t *)apr_pcalloc(pool_out, sizeof(apr_file_t));
+    (*out)->pool = pool_out;
     (*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
 #ifndef WAITIO_USES_POLL
     (*out)->pollset = 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;
 }
 
+static void file_pipe_block(apr_file_t **in, apr_file_t **out, apr_int32_t blocking)
+{
+    switch (blocking) {
+    case APR_FULL_BLOCK:
+        break;
+    case APR_READ_BLOCK:
+        apr_file_pipe_timeout_set(*out, 0);
+        break;
+    case APR_WRITE_BLOCK:
+        apr_file_pipe_timeout_set(*in, 0);
+        break;
+    default:
+        apr_file_pipe_timeout_set(*out, 0);
+        apr_file_pipe_timeout_set(*in, 0);
+        break;
+    }
+}
+
+APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in,
+        apr_file_t **out, apr_pool_t *pool)
+{
+    return file_pipe_create(in, out, pool, pool);
+}
+
 APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
                                                   apr_file_t **out, 
                                                   apr_int32_t blocking,
                                                   apr_pool_t *pool)
 {
     apr_status_t status;
 
-    if ((status = apr_file_pipe_create(in, out, pool)) != APR_SUCCESS)
+    if ((status = file_pipe_create(in, out, pool, pool)) != APR_SUCCESS) {
         return status;
+    }
 
-    switch (blocking) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_READ_BLOCK:
-            apr_file_pipe_timeout_set(*out, 0);
-            break;
-        case APR_WRITE_BLOCK:
-            apr_file_pipe_timeout_set(*in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(*out, 0);
-            apr_file_pipe_timeout_set(*in, 0);
+    file_pipe_block(in, out, blocking);
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_file_pipe_create_pools(apr_file_t **in,
+        apr_file_t **out, apr_int32_t blocking, apr_pool_t *pool_in, apr_pool_t *pool_out)
+{
+    apr_status_t status;
+
+    if ((status = file_pipe_create(in, out, pool_in, pool_out)) != APR_SUCCESS) {
+        return status;
     }
+
+    file_pipe_block(in, out, blocking);
 
     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;
 } 
 
     
 
Index: head/contrib/apr/file_io/unix/readwrite.c
===================================================================
--- head/contrib/apr/file_io/unix/readwrite.c	(revision 361677)
+++ head/contrib/apr/file_io/unix/readwrite.c	(revision 361678)
@@ -1,526 +1,528 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 !defined(BEOS_R5)
 #define USE_WAIT_FOR_IO
 #endif
 
 static apr_status_t file_read_buffered(apr_file_t *thefile, void *buf,
                                        apr_size_t *nbytes)
 {
     apr_ssize_t rv;
     char *pos = (char *)buf;
     apr_uint64_t blocksize;
     apr_uint64_t size = *nbytes;
 
     if (thefile->direction == 1) {
         rv = apr_file_flush_locked(thefile);
         if (rv) {
             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, 
                                  thefile->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;
     }
     return rv;
 }
 
 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) {
         file_lock(thefile);
         rv = file_read_buffered(thefile, buf, nbytes);
         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 == thefile->bufsize)   /* write buffer is full*/
                 rv = apr_file_flush_locked(thefile);
 
             blocksize = size > thefile->bufsize - thefile->bufpos ? 
                         thefile->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;
     apr_ssize_t 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
     /**
      * The problem with trying to output the entire iovec is that we cannot
      * maintain the behaviour that a real writev would have.  If we iterate
      * over the iovec one at a time, we lose the atomic properties of 
      * writev().  The other option is to combine the entire iovec into one
      * buffer that we could then send in one call to write().  This is not 
      * reasonable since we do not know how much data an iovec could contain.
      *
      * The only reasonable option, that maintains the semantics of a real 
      * writev(), is to only write the first iovec.  Callers of file_writev()
      * must deal with partial writes as they normally would. If you want to 
      * ensure an entire iovec is written, use apr_file_writev_full().
      */
 
     *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)
 {
     return apr_file_write_full(thefile, str, strlen(str), NULL);
 }
 
 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 = 0, ret;
 
         do {
             ret = write(thefile->filedes, thefile->buffer + written,
                         thefile->bufpos - written);
             if (ret > 0)
                 written += ret;
         } while (written < thefile->bufpos &&
                  (ret > 0 || (ret == -1 && errno == EINTR)));
         if (ret == -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_sync(apr_file_t *thefile)
 {
     apr_status_t rv = APR_SUCCESS;
 
     file_lock(thefile);
 
     if (thefile->buffered) {
         rv = apr_file_flush_locked(thefile);
 
         if (rv != APR_SUCCESS) {
             file_unlock(thefile);
             return rv;
         }
     }
 
     if (fsync(thefile->filedes)) {
         rv = apr_get_os_error();
     }
 
     file_unlock(thefile);
 
     return rv;
 }
 
 APR_DECLARE(apr_status_t) apr_file_datasync(apr_file_t *thefile)
 {
     apr_status_t rv = APR_SUCCESS;
 
     file_lock(thefile);
 
     if (thefile->buffered) {
         rv = apr_file_flush_locked(thefile);
 
         if (rv != APR_SUCCESS) {
             file_unlock(thefile);
             return rv;
         }
     }
 
 #ifdef HAVE_FDATASYNC
     if (fdatasync(thefile->filedes)) {
+#elif defined(F_FULLFSYNC)
+    if (fcntl(thefile->filedes, F_FULLFSYNC)) {
 #else
     if (fsync(thefile->filedes)) {
 #endif
         rv = apr_get_os_error();
     }
 
     file_unlock(thefile);
 
     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;
     }
 
     /* If we have an underlying buffer, we can be *much* more efficient
      * and skip over the apr_file_read calls.
      */
     if (thefile->buffered) {
         file_lock(thefile);
 
         if (thefile->direction == 1) {
             rv = apr_file_flush_locked(thefile);
             if (rv) {
                 file_unlock(thefile);
                 return rv;
             }
 
             thefile->direction = 0;
             thefile->bufpos = 0;
             thefile->dataRead = 0;
         }
 
         while (str < final) { /* leave room for trailing '\0' */
             /* Force ungetc leftover to call apr_file_read. */
             if (thefile->bufpos < thefile->dataRead &&
                 thefile->ungetchar == -1) {
                 *str = thefile->buffer[thefile->bufpos++];
             }
             else {
                 nbytes = 1;
                 rv = file_read_buffered(thefile, str, &nbytes);
                 if (rv != APR_SUCCESS) {
                     break;
                 }
             }
             if (*str == '\n') {
                 ++str;
                 break;
             }
             ++str;
         }
         file_unlock(thefile);
     }
     else {
         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;
 }
 
 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;
 
     /* don't really need a HUGE_STRING_LEN anymore */
     data.buf = malloc(HUGE_STRING_LEN);
     if (data.buf == NULL) {
         return -1;
     }
     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;
 }
Index: head/contrib/apr/file_io/unix/seek.c
===================================================================
--- head/contrib/apr/file_io/unix/seek.c	(revision 361677)
+++ head/contrib/apr/file_io/unix/seek.c	(revision 361678)
@@ -1,129 +1,136 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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, apr_off_t 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 (fp->buffered) {
         int rc = 0;
         file_lock(fp);
         if (fp->direction == 1 && fp->bufpos != 0) {
             apr_off_t len = fp->filePtr + fp->bufpos;
             if (offset < len) {
                 /* New file end fall below our write buffer limit.
                  * Figure out if and what needs to be flushed.
                  */
                 apr_off_t off = len - offset;
                 if (off >= 0 && off <= fp->bufpos)
                     fp->bufpos = fp->bufpos - (size_t)off;
                 else
                     fp->bufpos = 0;
             }
             rc = apr_file_flush_locked(fp);
             /* Reset buffer positions for write mode */
             fp->bufpos = fp->direction = fp->dataRead = 0;
         }
+        else if (fp->direction == 0) {
+            /* Discard the read buffer, as we are about to reposition
+             * ourselves to the end of file.
+             */
+            fp->bufpos = 0;
+            fp->dataRead = 0;
+        }
         file_unlock(fp);
         if (rc) {
             return rc;
         }
     }
     if (ftruncate(fp->filedes, offset) == -1) {
         return errno;
     }
     return apr_file_seek(fp, APR_SET, &offset);
 }
Index: head/contrib/apr/include/apr.h.in
===================================================================
--- head/contrib/apr/include/apr.h.in	(revision 361677)
+++ head/contrib/apr/include/apr.h.in	(revision 361678)
@@ -1,637 +1,656 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_PROCESS_H       @processh@
 #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_INTTYPES_H      @inttypesh@
 #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@
 #define APR_HAVE_WINDOWS_H       @windowsh@
 #define APR_HAVE_WINSOCK2_H      @winsock2h@
 
 /** @} */
 /** @} */
 
 /* We don't include our conditional headers within the doxyblocks 
  * or the extern "C" namespace 
  */
 
 #if APR_HAVE_WINDOWS_H && defined(WIN32)
 /* If windows.h was already included, our preferences don't matter.
  * 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 XP header files by default
  */
 #define _WIN32_WINNT 0x0501
 #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 <ws2tcpip.h>
 #include <mswsock.h>
 #else
 #include <winsock.h>
 #endif
 
 #endif /* ndef _WINDOWS_ */
 #endif /* APR_HAVE_WINDOWS_H */
 
 #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)
+#if APR_HAVE_STDINT_H
+#ifdef __cplusplus
 /* C99 7.18.4 requires that stdint.h only exposes INT64_C 
  * and UINT64_C for C++ implementations if this is defined: */
+#ifndef __STDC_CONSTANT_MACROS
 #define __STDC_CONSTANT_MACROS
 #endif
-
-#if APR_HAVE_STDINT_H
+/* C++ needs this too for PRI*NN formats: */
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+#endif /* __cplusplus */
 #include <stdint.h>
 #endif
 
+#if APR_HAVE_INTTYPES_H
+#include <inttypes.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
 
+/* __APPLE__ is now the official pre-defined macro for macOS */
+#ifdef __APPLE__
+#undef DARWIN
+#undef DARWIN_10
+#define DARWIN
+#define DARWIN_10
+#endif /* __APPLE__ */
 
 #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_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_SOCKADDR_UN    @have_sockaddr_un@
 #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_SA_STORAGE     @have_sa_storage@
 #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@
 #define APR_HAVE_IOVEC          @have_iovec@
 
 /*  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        @have_unicode_fs@
 #define APR_HAS_PROC_INVOKED      @have_proc_invoked@
 #define APR_HAS_USER              @apr_has_user@
 #define APR_HAS_LARGE_FILES       @aprlfs@
 #define APR_HAS_XTHREAD_FILES     @apr_has_xthread_files@
 #define APR_HAS_OS_UUID           @osuuid@
+#define APR_HAS_TIMEDLOCKS        @apr_has_timedlocks@
 
 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@
 
 /* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
  * to poll on files/pipes.
  */
 #define APR_FILES_AS_SOCKETS      @file_as_socket@
 
 /* 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;
 
 #define APR_SIZEOF_VOIDP @voidp_size@
 
 /*
  * Darwin 10's default compiler (gcc42) builds for both 64 and
  * 32 bit architectures unless specifically told not to.
  * In those cases, we need to override types depending on how
  * we're being built at compile time.
  * NOTE: This is an ugly work-around for Darwin's
  * concept of universal binaries, a single package
  * (executable, lib, etc...) which contains both 32
  * and 64 bit versions. The issue is that if APR is
  * built universally, if something else is compiled
  * against it, some bit sizes will depend on whether
  * it is 32 or 64 bit. This is determined by the __LP64__
  * flag. Since we need to support both, we have to
  * handle OS X unqiuely.
  */
 #ifdef DARWIN_10
 #undef APR_SIZEOF_VOIDP
-#undef INT64_C
-#undef UINT64_C
+#undef APR_INT64_C
+#undef APR_UINT64_C
 #ifdef __LP64__
  typedef  long            apr_int64_t;
  typedef  unsigned long   apr_uint64_t;
  #define APR_SIZEOF_VOIDP     8
- #define INT64_C(v)   (v ## L)
- #define UINT64_C(v)  (v ## UL)
+ #define APR_INT64_C(v)   (v ## L)
+ #define APR_UINT64_C(v)  (v ## UL)
 #else
  typedef  long long            apr_int64_t;
  typedef  unsigned long long   apr_uint64_t;
  #define APR_SIZEOF_VOIDP     4
- #define INT64_C(v)   (v ## LL)
- #define UINT64_C(v)  (v ## ULL)
+ #define APR_INT64_C(v)   (v ## LL)
+ #define APR_UINT64_C(v)  (v ## ULL)
 #endif
 #else
- typedef  @long_value@            apr_int64_t;
- typedef  unsigned @long_value@   apr_uint64_t;
+ typedef  @int64_value@           apr_int64_t;
+ typedef  @uint64_value@          apr_uint64_t;
+
+ /* Mechanisms to properly type numeric literals */
+ @int64_literal@
+ @uint64_literal@
 #endif
 
 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;
 
 #if APR_SIZEOF_VOIDP == 8
 typedef  apr_uint64_t            apr_uintptr_t;
 #else
 typedef  apr_uint32_t            apr_uintptr_t;
 #endif
 
 /* Are we big endian? */
 #define APR_IS_BIGENDIAN	@bigendian@
-
-/* Mechanisms to properly type numeric literals */
-@int64_literal@
-@uint64_literal@
 
 #ifdef INT16_MIN
 #define APR_INT16_MIN   INT16_MIN
 #else
 #define APR_INT16_MIN   (-0x7fff - 1)
 #endif
 
 #ifdef INT16_MAX
 #define APR_INT16_MAX  INT16_MAX
 #else
 #define APR_INT16_MAX   (0x7fff)
 #endif
 
 #ifdef UINT16_MAX
 #define APR_UINT16_MAX  UINT16_MAX
 #else
 #define APR_UINT16_MAX  (0xffff)
 #endif
 
 #ifdef INT32_MIN
 #define APR_INT32_MIN   INT32_MIN
 #else
 #define APR_INT32_MIN   (-0x7fffffff - 1)
 #endif
 
 #ifdef INT32_MAX
 #define APR_INT32_MAX  INT32_MAX
 #else
 #define APR_INT32_MAX  0x7fffffff
 #endif
 
 #ifdef UINT32_MAX
 #define APR_UINT32_MAX  UINT32_MAX
 #else
 #define APR_UINT32_MAX  (0xffffffffU)
 #endif
 
 #ifdef INT64_MIN
 #define APR_INT64_MIN   INT64_MIN
 #else
 #define APR_INT64_MIN   (APR_INT64_C(-0x7fffffffffffffff) - 1)
 #endif
 
 #ifdef INT64_MAX
 #define APR_INT64_MAX   INT64_MAX
 #else
 #define APR_INT64_MAX   APR_INT64_C(0x7fffffffffffffff)
 #endif
 
 #ifdef UINT64_MAX
 #define APR_UINT64_MAX  UINT64_MAX
 #else
 #define APR_UINT64_MAX  APR_UINT64_C(0xffffffffffffffff)
 #endif
 
 #define APR_SIZE_MAX    (~((apr_size_t)0))
 
 
 /* Definitions that APR programs need to work properly. */
 
 /**
  * APR public API wrap for C++ compilers.
  */
 #ifdef __cplusplus
 #define APR_BEGIN_DECLS     extern "C" {
 #define APR_END_DECLS       }
 #else
 #define APR_BEGIN_DECLS
 #define APR_END_DECLS
 #endif
 
 /** 
  * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
  * so that they follow the platform's calling convention.
  * <PRE>
  *
  * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
  *
  * </PRE>
  */
 #define APR_THREAD_FUNC       @apr_thread_func@
 
 #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.
  *
  * <PRE>
  * APR_DECLARE(rettype) apr_func(args)
  * </PRE>
  * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
  * @remark Note that when APR compiles the library itself, it passes the 
  * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
  * 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.
  * <PRE>
  *
  * APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
  *
  * </PRE>
  */
 #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.
  * 
  * <PRE>
  *
  * extern APR_DECLARE_DATA type apr_variable;\n
  * APR_DECLARE_DATA type apr_variable = value;
  *
  * </PRE>
  */
 #define APR_DECLARE_DATA
 
 #elif defined(APR_DECLARE_STATIC)
 #define APR_DECLARE(type)            type __stdcall
 #define APR_DECLARE_NONSTD(type)     type __cdecl
 #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 __cdecl
 #define APR_DECLARE_DATA             __declspec(dllexport)
 #else
 #define APR_DECLARE(type)            __declspec(dllimport) type __stdcall
 #define APR_DECLARE_NONSTD(type)     __declspec(dllimport) type __cdecl
 #define APR_DECLARE_DATA             __declspec(dllimport)
 #endif
 
 /* 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@
 
 /* And APR_UINT64_T_FMT */
 @uint64_t_fmt@
 
 /* And APR_UINT64_T_HEX_FMT */
 @uint64_t_hex_fmt@
 
 /*
  * Ensure we work with universal binaries on Darwin
  */
 #ifdef DARWIN_10
 
 #undef APR_HAS_LARGE_FILES
 #undef APR_SIZEOF_VOIDP
 #undef APR_INT64_T_FMT
 #undef APR_UINT64_T_FMT
 #undef APR_UINT64_T_HEX_FMT
 
 #ifdef __LP64__
  #define APR_HAS_LARGE_FILES  0
  #define APR_SIZEOF_VOIDP     8
  #define APR_INT64_T_FMT      "ld"
  #define APR_UINT64_T_FMT     "lu"
  #define APR_UINT64_T_HEX_FMT "lx"
 #else
  #define APR_HAS_LARGE_FILES  1
  #define APR_SIZEOF_VOIDP     4
  #define APR_INT64_T_FMT      "lld"
  #define APR_UINT64_T_FMT     "llu"
  #define APR_UINT64_T_HEX_FMT "llx"
 #endif
 
 #undef APR_IS_BIGENDIAN
 #ifdef __BIG_ENDIAN__
  #define APR_IS_BIGENDIAN	1
 #else
  #define APR_IS_BIGENDIAN	0
 #endif
 
 #undef APR_OFF_T_FMT
 #define APR_OFF_T_FMT "lld"
 
 #endif /* DARWIN_10 */
 
 /* 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 */
 #elif defined(__MINGW32__)
 typedef int apr_wait_t;
 #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
 
 #define APR_DSOPATH "@shlibpath_var@"
 
 /** @} */
 
 /* Definitions that only Win32 programs need to compile properly. */
 
 /* XXX These simply don't belong here, perhaps in apr_portable.h
  * based on some APR_HAVE_PID/GID/UID?
  */
 #ifdef __MINGW32__
 #ifndef __GNUC__
 typedef  int         pid_t;
 #endif
 typedef  int         uid_t;
 typedef  int         gid_t;
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* APR_H */
Index: head/contrib/apr/include/apr.hnw
===================================================================
--- head/contrib/apr/include/apr.hnw	(revision 361677)
+++ head/contrib/apr/include/apr.hnw	(revision 361678)
@@ -1,443 +1,445 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 the ./build/NWGNmakefile.
  */
 
 /**
  * @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)
 
 #undef  FD_SETSIZE
 #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 <netware.h>
 #include <nks/thread.h>
 #include <nks/synch.h>
 #include <nks/time.h>
 #include <signal.h>
 #ifdef USE_WINSOCK
 #include <novsock2.h>
 #ifdef NW_BUILD_IPV6
 #include <novtcpip.h>
 #endif
 #else
 #include <sys/socket.h>
 #include <sys/select.h>
 #endif
 #include <sys/types.h>
 
 #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_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
 #ifdef USE_WINSOCK
 #define APR_HAVE_ARPA_INET_H            0
 #define APR_HAVE_NETDB_H                0
 #define APR_HAVE_NETINET_IN_H           0
 #else
 #define APR_HAVE_ARPA_INET_H            1
 #define APR_HAVE_NETDB_H                1
 #define APR_HAVE_NETINET_IN_H           1
 #endif
 #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_SYSLIMITS_H        0
 #ifdef USE_WINSOCK
 #define APR_HAVE_SYS_SOCKET_H           0
 #define APR_HAVE_SYS_SOCKIO_H           0
 #define APR_HAVE_SYS_UN_H               0
 #else
 #define APR_HAVE_SYS_SOCKET_H           1
 #define APR_HAVE_SYS_SOCKIO_H           1
 #define APR_HAVE_SYS_UN_H               1
 #endif
 #define APR_HAVE_SYS_SIGNAL_H           1
 #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_WAIT_H             1
 #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_SOCKADDR_UN            0
 #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
 #define APR_HAVE_IOVEC                  1
 
 /*  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             1
 #define APR_HAS_XTHREAD_FILES           0
 #define APR_HAS_OS_UUID                 0
+#define APR_HAS_TIMEDLOCKS              1
 
 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0
 
 /* Netware can poll on files/pipes.
  */
 #define APR_FILES_AS_SOCKETS            1
 
 /* 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;
 #if APR_HAS_LARGE_FILES
 typedef  off64_t           apr_off_t;
 #else
 typedef  off_t             apr_off_t;
 #endif
 #ifdef USE_WINSOCK
 typedef  int               apr_socklen_t;
 #else
 typedef  size_t            apr_socklen_t;
 #endif
 typedef  apr_uint64_t      apr_ino_t;
 
 /* Are we big endian? */
 /* XXX: Fatal assumption on Alpha platforms */
 #define APR_IS_BIGENDIAN        0
 
 #ifdef UNKNOWN_NETWARE_64BIT_FLAG_NEEDED
 #define APR_SIZEOF_VOIDP   8
 #else
 #define APR_SIZEOF_VOIDP   4
 #endif
 
 #if APR_SIZEOF_VOIDP == 8
 typedef  apr_uint64_t            apr_uintptr_t;
 #else
 typedef  apr_uint32_t            apr_uintptr_t;
 #endif
 
 /* Mechanisms to properly type numeric literals */
 #define APR_INT64_C(val) (val##LL)
 #define APR_UINT64_C(val) (val##ULL)
 
 #ifdef INT16_MIN
 #define APR_INT16_MIN   INT16_MIN
 #else
 #define APR_INT16_MIN   (-0x7fff - 1)
 #endif
 
 #ifdef INT16_MAX
 #define APR_INT16_MAX  INT16_MAX
 #else
 #define APR_INT16_MAX   (0x7fff)
 #endif
 
 #ifdef UINT16_MAX
 #define APR_UINT16_MAX  UINT16_MAX
 #else
 #define APR_UINT16_MAX  (0xffff)
 #endif
 
 #ifdef INT32_MIN
 #define APR_INT32_MIN   INT32_MIN
 #else
 #define APR_INT32_MIN   (-0x7fffffff - 1)
 #endif
 
 #ifdef INT32_MAX
 #define APR_INT32_MAX  INT32_MAX
 #else
 #define APR_INT32_MAX  0x7fffffff
 #endif
 
 #ifdef UINT32_MAX
 #define APR_UINT32_MAX  UINT32_MAX
 #else
 #define APR_UINT32_MAX  (0xffffffffU)
 #endif
 
 #ifdef INT64_MIN
 #define APR_INT64_MIN   INT64_MIN
 #else
 #define APR_INT64_MIN   (APR_INT64_C(-0x7fffffffffffffff) - 1)
 #endif
 
 #ifdef INT64_MAX
 #define APR_INT64_MAX   INT64_MAX
 #else
 #define APR_INT64_MAX   APR_INT64_C(0x7fffffffffffffff)
 #endif
 
 #ifdef UINT64_MAX
 #define APR_UINT64_MAX  UINT64_MAX
 #else
 #define APR_UINT64_MAX  APR_UINT64_C(0xffffffffffffffff)
 #endif
 
 #define APR_SIZE_MAX    (~((apr_size_t)0))
 
 /* PROC mutex is a GLOBAL mutex on Netware */
 #define APR_PROC_MUTEX_IS_GLOBAL      1
 
 /* Definitions that APR programs need to work properly. */
 
 /**
  * APR public API wrap for C++ compilers.
  */
 #ifdef __cplusplus
 #define APR_BEGIN_DECLS     extern "C" {
 #define APR_END_DECLS       }
 #else
 #define APR_BEGIN_DECLS
 #define APR_END_DECLS
 #endif
 
 /**
  * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC,
  * so that they follow the platform's calling convention.
  * @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 APR_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"
 
 #if APR_HAS_LARGE_FILES
 #define APR_OFF_T_FMT            "lld"
 #else
 #define APR_OFF_T_FMT            "ld"
 #endif
 
 #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_DSOPATH "PATH"
 
 #define APR_INT64_T_FMT          "lld"
 #define APR_UINT64_T_FMT         "llu"
 #define APR_UINT64_T_HEX_FMT     "llx"
 #define APR_TIME_T_FMT APR_INT64_T_FMT
 
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* NETWARE */
 
 #endif /* APR_H */
Index: head/contrib/apr/include/apr.hw
===================================================================
--- head/contrib/apr/include/apr.hw	(revision 361677)
+++ head/contrib/apr/include/apr.hw	(revision 361678)
@@ -1,644 +1,667 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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. 
+ * 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.
  */
 
 /* Make sure we have our platform identifier macro defined we ask for later.
  */
 #if defined(_WIN32) && !defined(WIN32)
 #define WIN32 1
 #endif
 
 #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
  *   C4163: '_rotl64' : not available as an intrinsic function
  *   C4201: nonstandard extension nameless struct/unions
  *   C4244: int to char/short - precision loss
  *   C4514: unreferenced inline function removed
  */
+#if defined(_MSC_VER)
 #pragma warning(disable: 4100 4127 4163 4201 4514; once: 4057 4075 4244)
+#endif
 
 /* 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 XP header files by default
  */
 #define _WIN32_WINNT 0x0501
 #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 <ws2tcpip.h>
 #include <mswsock.h>
 #else
 #include <winsock.h>
 #endif
 #endif /* !_WINDOWS_ */
 
 /**
  * @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>
  */
 
 #define APR_INLINE __inline
 #define APR_HAS_INLINE          1
 #if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(__x)
 #endif
 
 #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_SEMAPHORE_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_IOCTL_H    0
 #define APR_HAVE_SYS_SENDFILE_H 0
 #define APR_HAVE_SYS_SIGNAL_H   0
 #define APR_HAVE_SYS_SOCKET_H   0
 #define APR_HAVE_SYS_SOCKIO_H   0
 #define APR_HAVE_SYS_SYSLIMITS_H 0
 #define APR_HAVE_SYS_TIME_H     0
 #define APR_HAVE_SYS_TYPES_H    1
 #define APR_HAVE_SYS_UIO_H      0
 #define APR_HAVE_SYS_UN_H       0
 #define APR_HAVE_SYS_WAIT_H     0
 #define APR_HAVE_TIME_H         1
 #define APR_HAVE_UNISTD_H       0
 #define APR_HAVE_STDDEF_H       1
 #define APR_HAVE_PROCESS_H      1
 #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_SCTP_H 0
 #define APR_HAVE_NETINET_SCTP_UIO_H 0
 #define APR_HAVE_NETINET_TCP_H  0
 #define APR_HAVE_PTHREAD_H      0
 #define APR_HAVE_SEMAPHORE_H    0
 #define APR_HAVE_SIGNAL_H       0
 #define APR_HAVE_STDARG_H       0
 #define APR_HAVE_STDINT_H       0
 #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_IOCTL_H    0
 #define APR_HAVE_SYS_SENDFILE_H 0
 #define APR_HAVE_SYS_SIGNAL_H   0
 #define APR_HAVE_SYS_SOCKET_H   0
 #define APR_HAVE_SYS_SOCKIO_H   0
 #define APR_HAVE_SYS_SYSLIMITS_H 0
 #define APR_HAVE_SYS_TIME_H     0
 #define APR_HAVE_SYS_TYPES_H    0
 #define APR_HAVE_SYS_UIO_H      0
 #define APR_HAVE_SYS_UN_H       0
 #define APR_HAVE_SYS_WAIT_H     0
 #define APR_HAVE_TIME_H         0
 #define APR_HAVE_UNISTD_H       0
 #define APR_HAVE_STDDEF_H       0
 #define APR_HAVE_PROCESS_H      0
 #endif
 
 /** @} */
 /** @} */
 
-/* We don't include our conditional headers within the doxyblocks 
- * or the extern "C" namespace 
+/* 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_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#if APR_HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#if APR_HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
 #if APR_HAVE_TIME_H
 #include <time.h>
 #endif
+
 #if APR_HAVE_PROCESS_H
 #include <process.h>
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
  * @addtogroup apr_platform
  * @ingroup APR 
  * @{
  */
 
 #define APR_HAVE_SHMEM_MMAP_TMP     0
 #define APR_HAVE_SHMEM_MMAP_SHM     0
 #define APR_HAVE_SHMEM_MMAP_ZERO    0
 #define APR_HAVE_SHMEM_SHMGET_ANON  0
 #define APR_HAVE_SHMEM_SHMGET       0
 #define APR_HAVE_SHMEM_MMAP_ANON    0
 #define APR_HAVE_SHMEM_BEOS         0
 
 #define APR_USE_SHMEM_MMAP_TMP     0
 #define APR_USE_SHMEM_MMAP_SHM     0
 #define APR_USE_SHMEM_MMAP_ZERO    0
 #define APR_USE_SHMEM_SHMGET_ANON  0
 #define APR_USE_SHMEM_SHMGET       0
 #define APR_USE_SHMEM_MMAP_ANON    0
 #define APR_USE_SHMEM_BEOS         0
 
-#define APR_USE_FLOCK_SERIALIZE           0 
+#define APR_USE_FLOCK_SERIALIZE           0
 #define APR_USE_POSIXSEM_SERIALIZE        0
 #define APR_USE_SYSVSEM_SERIALIZE         0
 #define APR_USE_FCNTL_SERIALIZE           0
-#define APR_USE_PROC_PTHREAD_SERIALIZE    0 
-#define APR_USE_PTHREAD_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_POSIXSEM_SERIALIZE        0
 #define APR_HAS_FCNTL_SERIALIZE           0
 #define APR_HAS_PROC_PTHREAD_SERIALIZE    0
 
 #define APR_PROCESS_LOCK_IS_GLOBAL        0
 
 #define APR_HAVE_CORKABLE_TCP   0
 #define APR_HAVE_GETRLIMIT      0
 #define APR_HAVE_ICONV          0
 #define APR_HAVE_IN_ADDR        1
 #define APR_HAVE_INET_ADDR      1
 #define APR_HAVE_INET_NETWORK   0
-#define APR_HAVE_IPV6           0
+#define APR_HAVE_IPV6           1
+#define APR_HAVE_SOCKADDR_UN    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_SA_STORAGE     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
 #define APR_HAVE_IOVEC          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
 
 /*  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
 #define APR_HAS_OS_UUID           1
+#define APR_HAS_TIMEDLOCKS        1
 
 #ifndef _WIN32_WCE
 #define APR_HAS_SENDFILE          1
 #define APR_HAS_USER              1
 #define APR_HAS_LARGE_FILES       1
 #define APR_HAS_XTHREAD_FILES     1
 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 1
 #else
 #define APR_HAS_SENDFILE          0
 #define APR_HAS_USER              0
 #define APR_HAS_LARGE_FILES       0
 #define APR_HAS_XTHREAD_FILES     0
 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0
 #endif
 
 /* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
  * to poll on files/pipes.
  */
 #define APR_FILES_AS_SOCKETS      0
 
 /* 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       @apr_tcp_nopush_flag@
 
 /* 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
+#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
 
 #if APR_SIZEOF_VOIDP == 8
 typedef  apr_uint64_t            apr_uintptr_t;
 #else
 typedef  apr_uint32_t            apr_uintptr_t;
 #endif
 
 /* Are we big endian? */
 /* XXX: Fatal assumption on Alpha platforms */
 #define APR_IS_BIGENDIAN	0
 
 /* Mechanisms to properly type numeric literals */
 
 #ifndef __GNUC__
 #define APR_INT64_C(val) (val##i64)
 #define APR_UINT64_C(val) (val##Ui64)
 #else
 #define APR_INT64_C(val) (val##LL)
 #define APR_UINT64_C(val) (val##ULL)
 #endif
 
 #ifdef INT16_MIN
 #define APR_INT16_MIN   INT16_MIN
 #else
 #define APR_INT16_MIN   (-0x7fff - 1)
 #endif
 
 #ifdef INT16_MAX
 #define APR_INT16_MAX  INT16_MAX
 #else
 #define APR_INT16_MAX   (0x7fff)
 #endif
 
 #ifdef UINT16_MAX
 #define APR_UINT16_MAX  UINT16_MAX
 #else
 #define APR_UINT16_MAX  (0xffff)
 #endif
 
 #ifdef INT32_MIN
 #define APR_INT32_MIN   INT32_MIN
 #else
 #define APR_INT32_MIN   (-0x7fffffff - 1)
 #endif
 
 #ifdef INT32_MAX
 #define APR_INT32_MAX  INT32_MAX
 #else
 #define APR_INT32_MAX  0x7fffffff
 #endif
 
 #ifdef UINT32_MAX
 #define APR_UINT32_MAX  UINT32_MAX
 #else
 #define APR_UINT32_MAX  (0xffffffffU)
 #endif
 
 #ifdef INT64_MIN
 #define APR_INT64_MIN   INT64_MIN
 #else
 #define APR_INT64_MIN   (APR_INT64_C(-0x7fffffffffffffff) - 1)
 #endif
 
 #ifdef INT64_MAX
 #define APR_INT64_MAX   INT64_MAX
 #else
 #define APR_INT64_MAX   APR_INT64_C(0x7fffffffffffffff)
 #endif
 
 #ifdef UINT64_MAX
 #define APR_UINT64_MAX  UINT64_MAX
 #else
 #define APR_UINT64_MAX  APR_UINT64_C(0xffffffffffffffff)
 #endif
 
 #define APR_SIZE_MAX    (~((apr_size_t)0))
 
 /* Definitions that APR programs need to work properly. */
 
 /**
  * APR public API wrap for C++ compilers.
  */
 #ifdef __cplusplus
 #define APR_BEGIN_DECLS     extern "C" {
 #define APR_END_DECLS       }
 #else
 #define APR_BEGIN_DECLS
 #define APR_END_DECLS
 #endif
 
 /** 
  * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
  * so that they follow the platform's calling convention.
  * <PRE>
  *
  * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
  *
  * </PRE>
  */
 #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.
  *
  * <PRE>
  * APR_DECLARE(rettype) apr_func(args)
  * </PRE>
  * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
  * @remark Note that when APR compiles the library itself, it passes the 
  * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
  * 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.
  * <PRE>
  *
  * APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
  *
  * </PRE>
  */
 #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.
  * 
  * <PRE>
  *
  * extern APR_DECLARE_DATA type apr_variable;\n
  * APR_DECLARE_DATA type apr_variable = value;
  *
  * </PRE>
  */
 #define APR_DECLARE_DATA
 
 #elif defined(APR_DECLARE_STATIC)
 #define APR_DECLARE(type)            type __stdcall
 #define APR_DECLARE_NONSTD(type)     type __cdecl
 #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 __cdecl
 #define APR_DECLARE_DATA             __declspec(dllexport)
 #else
 #define APR_DECLARE(type)            __declspec(dllimport) type __stdcall
 #define APR_DECLARE_NONSTD(type)     __declspec(dllimport) type __cdecl
 #define APR_DECLARE_DATA             __declspec(dllimport)
 #endif
 
 #ifdef _WIN64
 #define APR_SSIZE_T_FMT          "I64d"
 #define APR_SIZE_T_FMT           "I64u"
 #else
 #define APR_SSIZE_T_FMT          "d"
 #define APR_SIZE_T_FMT           "u"
 #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_UINT64_T_FMT         "I64u"
 #define APR_UINT64_T_HEX_FMT     "I64x"
 
 /* No difference between PROC and GLOBAL mutex */
 #define APR_PROC_MUTEX_IS_GLOBAL      1
 
 /* Local machine definition for console and log output. */
 #define APR_EOL_STR              "\r\n"
 
 typedef int apr_wait_t;
 
 #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
 
 #define APR_DSOPATH "PATH"
 
 /** @} */
 
 /* Definitions that only Win32 programs need to compile properly. */
 
 /* XXX These simply don't belong here, perhaps in apr_portable.h
  * based on some APR_HAVE_PID/GID/UID?
  */
 #ifndef __GNUC__
 typedef  int         pid_t;
 #endif
 typedef  int         uid_t;
 typedef  int         gid_t;
 
 /* Win32 .h ommissions we really need */
 #define STDIN_FILENO  0
 #define STDOUT_FILENO 1
 #define STDERR_FILENO 2
 
 #if APR_HAVE_IPV6
 
 /* Appears in later flavors, not the originals. */
 #ifndef in_addr6
 #define  in6_addr    in_addr6
 #endif
 
 #ifndef WS2TCPIP_INLINE
 #define IN6_IS_ADDR_V4MAPPED(a) \
     (   (*(const apr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
      && (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
 #endif
 
-#endif /* APR_HAS_IPV6 */
+#endif /* APR_HAVE_IPV6 */
 
 #ifdef __cplusplus
 }
 #endif
 
-/* Done with badly written headers
+/* Done with badly written headers, leave 'deprecated CRT' undeprecated
  */
 #if defined(_MSC_VER) && _MSC_VER >= 1200
 #pragma warning(pop)
+#if _MSC_VER >= 1400
 #pragma warning(disable: 4996)
+#endif
 #endif
 
 #endif /* WIN32 */
 
 #endif /* APR_H */
Index: head/contrib/apr/include/apr.hwc
===================================================================
--- head/contrib/apr/include/apr.hwc	(revision 361677)
+++ head/contrib/apr/include/apr.hwc	(revision 361678)
@@ -1,641 +1,664 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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.hwc 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. 
+ * 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.
  */
 
 /* Make sure we have our platform identifier macro defined we ask for later.
  */
 #if defined(_WIN32) && !defined(WIN32)
 #define WIN32 1
 #endif
 
 #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
  *   C4163: '_rotl64' : not available as an intrinsic function
  *   C4201: nonstandard extension nameless struct/unions
  *   C4244: int to char/short - precision loss
  *   C4514: unreferenced inline function removed
  */
+#if defined(_MSC_VER)
 #pragma warning(disable: 4100 4127 4163 4201 4514; once: 4057 4075 4244)
+#endif
 
 /* 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
 #define _WIN32_WINNT @win32_winnt_str@
 #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 <ws2tcpip.h>
 #include <mswsock.h>
 #else
 #include <winsock.h>
 #endif
 #endif /* !_WINDOWS_ */
 
 /**
  * @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>
  */
 
 #define APR_INLINE __inline
 #define APR_HAS_INLINE          1
 #if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(__x)
 #endif
 
 #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_SEMAPHORE_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_IOCTL_H    0
 #define APR_HAVE_SYS_SENDFILE_H 0
 #define APR_HAVE_SYS_SIGNAL_H   0
 #define APR_HAVE_SYS_SOCKET_H   0
 #define APR_HAVE_SYS_SOCKIO_H   0
 #define APR_HAVE_SYS_SYSLIMITS_H 0
 #define APR_HAVE_SYS_TIME_H     0
 #define APR_HAVE_SYS_TYPES_H    1
 #define APR_HAVE_SYS_UIO_H      0
 #define APR_HAVE_SYS_UN_H       0
 #define APR_HAVE_SYS_WAIT_H     0
 #define APR_HAVE_TIME_H         1
 #define APR_HAVE_UNISTD_H       0
 #define APR_HAVE_STDDEF_H       1
 #define APR_HAVE_PROCESS_H      1
 #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_SCTP_H 0
 #define APR_HAVE_NETINET_SCTP_UIO_H 0
 #define APR_HAVE_NETINET_TCP_H  0
 #define APR_HAVE_PTHREAD_H      0
 #define APR_HAVE_SEMAPHORE_H    0
 #define APR_HAVE_SIGNAL_H       0
 #define APR_HAVE_STDARG_H       0
 #define APR_HAVE_STDINT_H       0
 #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_IOCTL_H    0
 #define APR_HAVE_SYS_SENDFILE_H 0
 #define APR_HAVE_SYS_SIGNAL_H   0
 #define APR_HAVE_SYS_SOCKET_H   0
 #define APR_HAVE_SYS_SOCKIO_H   0
 #define APR_HAVE_SYS_SYSLIMITS_H 0
 #define APR_HAVE_SYS_TIME_H     0
 #define APR_HAVE_SYS_TYPES_H    0
 #define APR_HAVE_SYS_UIO_H      0
 #define APR_HAVE_SYS_UN_H       0
 #define APR_HAVE_SYS_WAIT_H     0
 #define APR_HAVE_TIME_H         0
 #define APR_HAVE_UNISTD_H       0
 #define APR_HAVE_STDDEF_H       0
 #define APR_HAVE_PROCESS_H      0
 #endif
 
 /** @} */
 /** @} */
 
-/* We don't include our conditional headers within the doxyblocks 
- * or the extern "C" namespace 
+/* 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_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#if APR_HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#if APR_HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
 #if APR_HAVE_TIME_H
 #include <time.h>
 #endif
+
 #if APR_HAVE_PROCESS_H
 #include <process.h>
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
  * @addtogroup apr_platform
  * @ingroup APR 
  * @{
  */
 
 #define APR_HAVE_SHMEM_MMAP_TMP     0
 #define APR_HAVE_SHMEM_MMAP_SHM     0
 #define APR_HAVE_SHMEM_MMAP_ZERO    0
 #define APR_HAVE_SHMEM_SHMGET_ANON  0
 #define APR_HAVE_SHMEM_SHMGET       0
 #define APR_HAVE_SHMEM_MMAP_ANON    0
 #define APR_HAVE_SHMEM_BEOS         0
 
 #define APR_USE_SHMEM_MMAP_TMP     0
 #define APR_USE_SHMEM_MMAP_SHM     0
 #define APR_USE_SHMEM_MMAP_ZERO    0
 #define APR_USE_SHMEM_SHMGET_ANON  0
 #define APR_USE_SHMEM_SHMGET       0
 #define APR_USE_SHMEM_MMAP_ANON    0
 #define APR_USE_SHMEM_BEOS         0
 
-#define APR_USE_FLOCK_SERIALIZE           0 
+#define APR_USE_FLOCK_SERIALIZE           0
 #define APR_USE_POSIXSEM_SERIALIZE        0
 #define APR_USE_SYSVSEM_SERIALIZE         0
 #define APR_USE_FCNTL_SERIALIZE           0
-#define APR_USE_PROC_PTHREAD_SERIALIZE    0 
-#define APR_USE_PTHREAD_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_POSIXSEM_SERIALIZE        0
 #define APR_HAS_FCNTL_SERIALIZE           0
 #define APR_HAS_PROC_PTHREAD_SERIALIZE    0
 
 #define APR_PROCESS_LOCK_IS_GLOBAL        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           @apr_have_ipv6_10@
+#define APR_HAVE_SOCKADDR_UN    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_SA_STORAGE     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
 #define APR_HAVE_IOVEC          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
 
 /*  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
 #define APR_HAS_OS_UUID           1
+#define APR_HAS_TIMEDLOCKS        1
 
 #ifndef _WIN32_WCE
 #define APR_HAS_SENDFILE          1
 #define APR_HAS_USER              1
 #define APR_HAS_LARGE_FILES       1
 #define APR_HAS_XTHREAD_FILES     1
 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 1
 #else
 #define APR_HAS_SENDFILE          0
 #define APR_HAS_USER              0
 #define APR_HAS_LARGE_FILES       0
 #define APR_HAS_XTHREAD_FILES     0
 #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0
 #endif
 
 /* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
  * to poll on files/pipes.
  */
 #define APR_FILES_AS_SOCKETS      0
 
 /* 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       @apr_tcp_nopush_flag@
 
 /* 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
+#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
 
 #if APR_SIZEOF_VOIDP == 8
 typedef  apr_uint64_t            apr_uintptr_t;
 #else
 typedef  apr_uint32_t            apr_uintptr_t;
 #endif
 
 /* Are we big endian? */
 /* XXX: Fatal assumption on Alpha platforms */
 #define APR_IS_BIGENDIAN	0
 
 /* Mechanisms to properly type numeric literals */
 
 #ifndef __GNUC__
 #define APR_INT64_C(val) (val##i64)
 #define APR_UINT64_C(val) (val##Ui64)
 #else
 #define APR_INT64_C(val) (val##LL)
 #define APR_UINT64_C(val) (val##ULL)
 #endif
 
 #ifdef INT16_MIN
 #define APR_INT16_MIN   INT16_MIN
 #else
 #define APR_INT16_MIN   (-0x7fff - 1)
 #endif
 
 #ifdef INT16_MAX
 #define APR_INT16_MAX  INT16_MAX
 #else
 #define APR_INT16_MAX   (0x7fff)
 #endif
 
 #ifdef UINT16_MAX
 #define APR_UINT16_MAX  UINT16_MAX
 #else
 #define APR_UINT16_MAX  (0xffff)
 #endif
 
 #ifdef INT32_MIN
 #define APR_INT32_MIN   INT32_MIN
 #else
 #define APR_INT32_MIN   (-0x7fffffff - 1)
 #endif
 
 #ifdef INT32_MAX
 #define APR_INT32_MAX  INT32_MAX
 #else
 #define APR_INT32_MAX  0x7fffffff
 #endif
 
 #ifdef UINT32_MAX
 #define APR_UINT32_MAX  UINT32_MAX
 #else
 #define APR_UINT32_MAX  (0xffffffffU)
 #endif
 
 #ifdef INT64_MIN
 #define APR_INT64_MIN   INT64_MIN
 #else
 #define APR_INT64_MIN   (APR_INT64_C(-0x7fffffffffffffff) - 1)
 #endif
 
 #ifdef INT64_MAX
 #define APR_INT64_MAX   INT64_MAX
 #else
 #define APR_INT64_MAX   APR_INT64_C(0x7fffffffffffffff)
 #endif
 
 #ifdef UINT64_MAX
 #define APR_UINT64_MAX  UINT64_MAX
 #else
 #define APR_UINT64_MAX  APR_UINT64_C(0xffffffffffffffff)
 #endif
 
 #define APR_SIZE_MAX    (~((apr_size_t)0))
 
 /* Definitions that APR programs need to work properly. */
 
 /**
  * APR public API wrap for C++ compilers.
  */
 #ifdef __cplusplus
 #define APR_BEGIN_DECLS     extern "C" {
 #define APR_END_DECLS       }
 #else
 #define APR_BEGIN_DECLS
 #define APR_END_DECLS
 #endif
 
 /** 
  * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
  * so that they follow the platform's calling convention.
  * <PRE>
  *
  * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
  *
  * </PRE>
  */
 #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.
  *
  * <PRE>
  * APR_DECLARE(rettype) apr_func(args)
  * </PRE>
  * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
  * @remark Note that when APR compiles the library itself, it passes the 
  * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
  * 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.
  * <PRE>
  *
  * APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
  *
  * </PRE>
  */
 #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.
  * 
  * <PRE>
  *
  * extern APR_DECLARE_DATA type apr_variable;\n
  * APR_DECLARE_DATA type apr_variable = value;
  *
  * </PRE>
  */
 #define APR_DECLARE_DATA
 
 #elif defined(APR_DECLARE_STATIC)
 #define APR_DECLARE(type)            type __stdcall
 #define APR_DECLARE_NONSTD(type)     type __cdecl
 #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 __cdecl
 #define APR_DECLARE_DATA             __declspec(dllexport)
 #else
 #define APR_DECLARE(type)            __declspec(dllimport) type __stdcall
 #define APR_DECLARE_NONSTD(type)     __declspec(dllimport) type __cdecl
 #define APR_DECLARE_DATA             __declspec(dllimport)
 #endif
 
 #ifdef _WIN64
 #define APR_SSIZE_T_FMT          "I64d"
 #define APR_SIZE_T_FMT           "I64u"
 #else
 #define APR_SSIZE_T_FMT          "d"
 #define APR_SIZE_T_FMT           "u"
 #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_UINT64_T_FMT         "I64u"
 #define APR_UINT64_T_HEX_FMT     "I64x"
 
 /* No difference between PROC and GLOBAL mutex */
 #define APR_PROC_MUTEX_IS_GLOBAL      1
 
 /* Local machine definition for console and log output. */
 #define APR_EOL_STR              "\r\n"
 
 typedef int apr_wait_t;
 
 #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
 
 #define APR_DSOPATH "PATH"
 
 /** @} */
 
 /* Definitions that only Win32 programs need to compile properly. */
 
 /* XXX These simply don't belong here, perhaps in apr_portable.h
  * based on some APR_HAVE_PID/GID/UID?
  */
 #ifndef __GNUC__
 typedef  int         pid_t;
 #endif
 typedef  int         uid_t;
 typedef  int         gid_t;
 
 /* Win32 .h ommissions we really need */
 #define STDIN_FILENO  0
 #define STDOUT_FILENO 1
 #define STDERR_FILENO 2
 
 #if APR_HAVE_IPV6
 
 /* Appears in later flavors, not the originals. */
 #ifndef in_addr6
 #define  in6_addr    in_addr6
 #endif
 
 #ifndef WS2TCPIP_INLINE
 #define IN6_IS_ADDR_V4MAPPED(a) \
     (   (*(const apr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
      && (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
 #endif
 
-#endif /* APR_HAS_IPV6 */
+#endif /* APR_HAVE_IPV6 */
 
 #ifdef __cplusplus
 }
 #endif
 
-/* Done with badly written headers
+/* Done with badly written headers, leave 'deprecated CRT' undeprecated
  */
 #if defined(_MSC_VER) && _MSC_VER >= 1200
 #pragma warning(pop)
+#if _MSC_VER >= 1400
 #pragma warning(disable: 4996)
+#endif
 #endif
 
 #endif /* WIN32 */
 
 #endif /* APR_H */
Index: head/contrib/apr/include/apr_allocator.h
===================================================================
--- head/contrib/apr/include/apr_allocator.h	(revision 361677)
+++ head/contrib/apr/include/apr_allocator.h	(revision 361678)
@@ -1,169 +1,179 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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
  * @note The next, ref and first_avail fields are available for use by the
  *       caller of apr_allocator_alloc(), the remaining fields are read-only.
  *       The next field has to be used with caution and sensibly set when the
  *       memnode is passed back to apr_allocator_free().  See apr_allocator_free()
  *       for details.  
  *       The ref and first_avail fields will be properly restored by
  *       apr_allocator_free().
  */
 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)
                           __attribute__((nonnull(1)));
 
 /**
  * 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)
                   __attribute__((nonnull(1)));
 
 /**
  * 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)
                              __attribute__((nonnull(1)));
 
 /**
  * Free a list of blocks of mem, giving them back to the allocator.
  * The list is typically terminated by a memnode with its next field
  * set to NULL.
  * @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)
                   __attribute__((nonnull(1,2)));
+ 
+/**
+ * Get the true size that would be allocated for the given size (including
+ * the header and alignment).
+ * @param allocator The allocator from which to the memory would be allocated
+ * @param size The size to align
+ * @return The aligned size (or zero on apr_size_t overflow)
+ */
+APR_DECLARE(apr_size_t) apr_allocator_align(apr_allocator_t *allocator,
+                                            apr_size_t size);
 
 #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)
                   __attribute__((nonnull(1)));
 
 /**
  * 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)
                           __attribute__((nonnull(1)));
 
 /**
  * Set the current threshold at which the allocator should start
  * giving blocks back to the system.
  * @param allocator The allocator to 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)
                   __attribute__((nonnull(1)));
 
 #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)
                   __attribute__((nonnull(1)));
 
 /**
  * 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)
                                   __attribute__((nonnull(1)));
 
 #endif /* APR_HAS_THREADS */
 
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* !APR_ALLOCATOR_H */
Index: head/contrib/apr/include/apr_atomic.h
===================================================================
--- head/contrib/apr/include/apr_atomic.h	(revision 361677)
+++ head/contrib/apr/include/apr_atomic.h	(revision 361678)
@@ -1,140 +1,207 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #ifndef APR_ATOMIC_H
 #define APR_ATOMIC_H
 
 /**
  * @file apr_atomic.h
  * @brief APR Atomic Operations
  */
 
 #include "apr.h"
 #include "apr_pools.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
  * @defgroup apr_atomic Atomic Operations
  * @ingroup APR 
  * @{
  */
 
 /**
  * this function is required on some platforms to initialize the
  * atomic operation's internal structures
  * @param p pool
  * @return APR_SUCCESS on successful completion
  * @remark Programs do NOT need to call this directly. APR will call this
- *         automatically from apr_initialize.
+ *         automatically from apr_initialize().
  * @internal
  */
 APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p);
 
 /*
  * Atomic operations on 32-bit values
  * Note: Each of these functions internally implements a memory barrier
  * on platforms that require it
  */
 
 /**
  * atomically read an apr_uint32_t from memory
  * @param mem the pointer
  */
 APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem);
 
 /**
  * atomically set an apr_uint32_t in memory
  * @param mem pointer to the object
  * @param val value that the object will assume
  */
 APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val);
 
 /**
  * atomically add 'val' to an apr_uint32_t
  * @param mem pointer to the object
  * @param val amount to add
  * @return old value pointed to by mem
  */
 APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val);
 
 /**
  * atomically subtract 'val' from an apr_uint32_t
  * @param mem pointer to the object
  * @param val amount to subtract
  */
 APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val);
 
 /**
  * atomically increment an apr_uint32_t by 1
  * @param mem pointer to the object
  * @return old value pointed to by mem
  */
 APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem);
 
 /**
  * atomically decrement an apr_uint32_t by 1
  * @param mem pointer to the atomic value
  * @return zero if the value becomes zero on decrement, otherwise non-zero
  */
 APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem);
 
 /**
  * compare an apr_uint32_t's value with 'cmp'.
  * If they are the same swap the value with 'with'
  * @param mem pointer to the value
  * @param with what to swap it with
  * @param cmp the value to compare it to
  * @return the old value of *mem
  */
 APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
                               apr_uint32_t cmp);
 
 /**
  * exchange an apr_uint32_t's value with 'val'.
  * @param mem pointer to the value
  * @param val what to swap it with
  * @return the old value of *mem
  */
 APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val);
+
+/*
+ * Atomic operations on 64-bit values
+ * Note: Each of these functions internally implements a memory barrier
+ * on platforms that require it
+ */
+
+/**
+ * atomically read an apr_uint64_t from memory
+ * @param mem the pointer
+ */
+APR_DECLARE(apr_uint64_t) apr_atomic_read64(volatile apr_uint64_t *mem);
+
+/**
+ * atomically set an apr_uint64_t in memory
+ * @param mem pointer to the object
+ * @param val value that the object will assume
+ */
+APR_DECLARE(void) apr_atomic_set64(volatile apr_uint64_t *mem, apr_uint64_t val);
+
+/**
+ * atomically add 'val' to an apr_uint64_t
+ * @param mem pointer to the object
+ * @param val amount to add
+ * @return old value pointed to by mem
+ */
+APR_DECLARE(apr_uint64_t) apr_atomic_add64(volatile apr_uint64_t *mem, apr_uint64_t val);
+
+/**
+ * atomically subtract 'val' from an apr_uint64_t
+ * @param mem pointer to the object
+ * @param val amount to subtract
+ */
+APR_DECLARE(void) apr_atomic_sub64(volatile apr_uint64_t *mem, apr_uint64_t val);
+
+/**
+ * atomically increment an apr_uint64_t by 1
+ * @param mem pointer to the object
+ * @return old value pointed to by mem
+ */
+APR_DECLARE(apr_uint64_t) apr_atomic_inc64(volatile apr_uint64_t *mem);
+
+/**
+ * atomically decrement an apr_uint64_t by 1
+ * @param mem pointer to the atomic value
+ * @return zero if the value becomes zero on decrement, otherwise non-zero
+ */
+APR_DECLARE(int) apr_atomic_dec64(volatile apr_uint64_t *mem);
+
+/**
+ * compare an apr_uint64_t's value with 'cmp'.
+ * If they are the same swap the value with 'with'
+ * @param mem pointer to the value
+ * @param with what to swap it with
+ * @param cmp the value to compare it to
+ * @return the old value of *mem
+ */
+APR_DECLARE(apr_uint64_t) apr_atomic_cas64(volatile apr_uint64_t *mem, apr_uint64_t with,
+                              apr_uint64_t cmp);
+
+/**
+ * exchange an apr_uint64_t's value with 'val'.
+ * @param mem pointer to the value
+ * @param val what to swap it with
+ * @return the old value of *mem
+ */
+APR_DECLARE(apr_uint64_t) apr_atomic_xchg64(volatile apr_uint64_t *mem, apr_uint64_t val);
 
 /**
  * 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
  */
 APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp);
 
 /**
  * exchange a pair of pointer values
  * @param mem pointer to the pointer
  * @param with what to swap it with
  * @return the old value of the pointer
  */
 APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with);
 
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif	/* !APR_ATOMIC_H */
Index: head/contrib/apr/include/apr_cstr.h
===================================================================
--- head/contrib/apr/include/apr_cstr.h	(nonexistent)
+++ head/contrib/apr/include/apr_cstr.h	(revision 361678)
@@ -0,0 +1,292 @@
+/* ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ */
+
+/**
+ * @file apr_cstr.h
+ * @brief C string goodies.
+ */
+
+#ifndef APR_CSTR_H
+#define APR_CSTR_H
+
+#include <apr.h>          /* for apr_size_t */
+#include <apr_pools.h>    /* for apr_pool_t */
+#include <apr_tables.h>   /* for apr_array_header_t */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @defgroup apr_cstr C (POSIX) locale string functions
+ * @ingroup apr_strings
+ *
+ * The apr_cstr_* functions provide traditional C char * string text handling,
+ * and notabilty they treat all text in the C (a.k.a. POSIX) locale using the
+ * minimal POSIX character set, represented in either ASCII or a corresponding
+ * EBCDIC subset.
+ *
+ * Character values outside of that set are treated as opaque bytes, and all
+ * multi-byte character sequences are handled as individual distinct octets.
+ *
+ * Multi-byte characters sequences whose octets fall in the ASCII range cause
+ * unexpected results, such as in the ISO-2022-JP code page where ASCII octets
+ * occur within both shift-state and multibyte sequences.
+ *
+ * In the case of the UTF-8 encoding, all multibyte characters all fall outside
+ * of the C/POSIX range of characters, so these functions are generally safe
+ * to use on UTF-8 strings. The programmer must be aware that each octet may
+ * not represent a distinct printable character in such encodings.
+ *
+ * The standard C99/POSIX string functions, rather than apr_cstr, should be
+ * used in all cases where the current locale and encoding of the text is
+ * significant.
+ * @{
+ */
+
+
+/** Divide @a input into substrings, interpreting any char from @a sep
+ * as a token separator.
+ *
+ * Return an array of copies of those substrings (plain const char*),
+ * allocating both the array and the copies in @a pool.
+ *
+ * None of the elements added to the array contain any of the
+ * characters in @a sep_chars, and none of the new elements are empty
+ * (thus, it is possible that the returned array will have length
+ * zero).
+ *
+ * If @a chop_whitespace is TRUE, then remove leading and trailing
+ * whitespace from the returned strings.
+ *
+ * @since New in 1.6
+ */
+APR_DECLARE(apr_array_header_t *) apr_cstr_split(const char *input,
+                                                 const char *sep_chars,
+                                                 int chop_whitespace,
+                                                 apr_pool_t *pool);
+
+/** Like apr_cstr_split(), but append to existing @a array instead of
+ * creating a new one.  Allocate the copied substrings in @a pool
+ * (i.e., caller decides whether or not to pass @a array->pool as @a pool).
+ *
+ * @since New in 1.6
+ */
+APR_DECLARE(void) apr_cstr_split_append(apr_array_header_t *array,
+                                        const char *input,
+                                        const char *sep_chars,
+                                        int chop_whitespace,
+                                        apr_pool_t *pool);
+
+
+/** Return @c TRUE iff @a str matches any of the elements of @a list, a list
+ * of zero or more glob patterns.
+ *
+ * @since New in 1.6
+ */
+APR_DECLARE(int) apr_cstr_match_glob_list(const char *str,
+                                          const apr_array_header_t *list);
+
+/** Return @c TRUE iff @a str exactly matches any of the elements of @a list.
+ *
+ * @since New in 1.6
+ */
+APR_DECLARE(int) apr_cstr_match_list(const char *str,
+                                     const apr_array_header_t *list);
+
+/**
+ * Get the next token from @a *str interpreting any char from @a sep as a
+ * token separator.  Separators at the beginning of @a str will be skipped.
+ * Returns a pointer to the beginning of the first token in @a *str or NULL
+ * if no token is left.  Modifies @a str such that the next call will return
+ * the next token.
+ *
+ * @note The content of @a *str may be modified by this function.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(char *) apr_cstr_tokenize(const char *sep, char **str);
+
+/**
+ * Return the number of line breaks in @a msg, allowing any kind of newline
+ * termination (CR, LF, CRLF, or LFCR), even inconsistent.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(int) apr_cstr_count_newlines(const char *msg);
+
+#if 0 /* XXX: stringbuf logic is not present in APR */
+/**
+ * Return a cstring which is the concatenation of @a strings (an array
+ * of char *) each followed by @a separator (that is, @a separator
+ * will also end the resulting string).  Allocate the result in @a pool.
+ * If @a strings is empty, then return the empty string.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(char *) apr_cstr_join(const apr_array_header_t *strings,
+                                  const char *separator,
+                                  apr_pool_t *pool);
+#endif
+
+/**
+ * Perform a case-insensitive comparison of two strings @a atr1 and @a atr2,
+ * treating upper and lower case values of the 26 standard C/POSIX alphabetic
+ * characters as equivalent. Extended latin characters outside of this set
+ * are treated as unique octets, irrespective of the current locale.
+ *
+ * Returns in integer greater than, equal to, or less than 0,
+ * according to whether @a str1 is considered greater than, equal to,
+ * or less than @a str2.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(int) apr_cstr_casecmp(const char *str1, const char *str2);
+
+/**
+ * Perform a case-insensitive comparison of two strings @a atr1 and @a atr2,
+ * treating upper and lower case values of the 26 standard C/POSIX alphabetic
+ * characters as equivalent. Extended latin characters outside of this set
+ * are treated as unique octets, irrespective of the current locale.
+ *
+ * Returns in integer greater than, equal to, or less than 0,
+ * according to whether @a str1 is considered greater than, equal to,
+ * or less than @a str2.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(int) apr_cstr_casecmpn(const char *str1,
+                                   const char *str2,
+                                   apr_size_t n);
+
+/**
+ * Parse the C string @a str into a 64 bit number, and return it in @a *n.
+ * Assume that the number is represented in base @a base.
+ * Raise an error if conversion fails (e.g. due to overflow), or if the
+ * converted number is smaller than @a minval or larger than @a maxval.
+ *
+ * Leading whitespace in @a str is skipped in a locale-dependent way.
+ * After that, the string may contain an optional '+' (positive, default)
+ * or '-' (negative) character, followed by an optional '0x' prefix if
+ * @a base is 0 or 16, followed by numeric digits appropriate for the base.
+ * If there are any more characters after the numeric digits, an error is
+ * returned.
+ *
+ * If @a base is zero, then a leading '0x' or '0X' prefix means hexadecimal,
+ * else a leading '0' means octal (implemented, though not documented, in
+ * apr_strtoi64() in APR 0.9.0 through 1.5.0), else use base ten.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_strtoi64(apr_int64_t *n, const char *str,
+                                            apr_int64_t minval,
+                                            apr_int64_t maxval,
+                                            int base);
+
+/**
+ * Parse the C string @a str into a 64 bit number, and return it in @a *n.
+ * Assume that the number is represented in base 10.
+ * Raise an error if conversion fails (e.g. due to overflow).
+ *
+ * The behaviour otherwise is as described for apr_cstr_strtoi64().
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_atoi64(apr_int64_t *n, const char *str);
+
+/**
+ * Parse the C string @a str into a 32 bit number, and return it in @a *n.
+ * Assume that the number is represented in base 10.
+ * Raise an error if conversion fails (e.g. due to overflow).
+ *
+ * The behaviour otherwise is as described for apr_cstr_strtoi64().
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_atoi(int *n, const char *str);
+
+/**
+ * Parse the C string @a str into an unsigned 64 bit number, and return
+ * it in @a *n. Assume that the number is represented in base @a base.
+ * Raise an error if conversion fails (e.g. due to overflow), or if the
+ * converted number is smaller than @a minval or larger than @a maxval.
+ *
+ * Leading whitespace in @a str is skipped in a locale-dependent way.
+ * After that, the string may contain an optional '+' (positive, default)
+ * or '-' (negative) character, followed by an optional '0x' prefix if
+ * @a base is 0 or 16, followed by numeric digits appropriate for the base.
+ * If there are any more characters after the numeric digits, an error is
+ * returned.
+ *
+ * If @a base is zero, then a leading '0x' or '0X' prefix means hexadecimal,
+ * else a leading '0' means octal (as implemented, though not documented, in
+ * apr_strtoi64(), else use base ten.
+ *
+ * @warning The implementation returns APR_ERANGE if the parsed number
+ * is greater than APR_INT64_MAX, even if it is not greater than @a maxval.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_strtoui64(apr_uint64_t *n, const char *str,
+                                             apr_uint64_t minval,
+                                             apr_uint64_t maxval,
+                                             int base);
+
+/**
+ * Parse the C string @a str into an unsigned 64 bit number, and return
+ * it in @a *n. Assume that the number is represented in base 10.
+ * Raise an error if conversion fails (e.g. due to overflow).
+ *
+ * The behaviour otherwise is as described for apr_cstr_strtoui64(),
+ * including the upper limit of APR_INT64_MAX.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_atoui64(apr_uint64_t *n, const char *str);
+
+/**
+ * Parse the C string @a str into an unsigned 32 bit number, and return
+ * it in @a *n. Assume that the number is represented in base 10.
+ * Raise an error if conversion fails (e.g. due to overflow).
+ *
+ * The behaviour otherwise is as described for apr_cstr_strtoui64(),
+ * including the upper limit of APR_INT64_MAX.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(apr_status_t) apr_cstr_atoui(unsigned int *n, const char *str);
+
+/**
+ * Skip the common prefix @a prefix from the C string @a str, and return
+ * a pointer to the next character after the prefix.
+ * Return @c NULL if @a str does not start with @a prefix.
+ *
+ * @since New in 1.6.
+ */
+APR_DECLARE(const char *) apr_cstr_skip_prefix(const char *str,
+                                               const char *prefix);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif  /* SVN_STRING_H */

Property changes on: head/contrib/apr/include/apr_cstr.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/apr/include/apr_encode.h
===================================================================
--- head/contrib/apr/include/apr_encode.h	(nonexistent)
+++ head/contrib/apr/include/apr_encode.h	(revision 361678)
@@ -0,0 +1,569 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file apr_encode.h
+ * @brief APR-UTIL Encoding
+ */
+#ifndef APR_ENCODE_H
+#define APR_ENCODE_H
+
+#include "apr.h"
+#include "apr_general.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @defgroup APR_Util_Encode Base64/Base64Url/Base32/Base32Hex/Base16 Encoding
+ * @ingroup APR_Util
+ * @{
+ */
+
+/**
+ * RFC4648 and RFC7515 compliant BASE64, BASE64URL, BASE32, BASE32HEX
+ * and BASE16 encode/decode functions.
+ *
+ * The following encodings are supported:
+ *
+ * - Base 64 Encoding
+ *
+ *   o Use flag APR_ENCODE_NONE
+ *   o https://tools.ietf.org/html/rfc4648#section-4
+ *
+ * - Base 64 Encoding with URL and Filename Safe Alphabet
+ *
+ *   o Use flag APR_ENCODE_URL
+ *   o https://tools.ietf.org/html/rfc4648#section-5
+ *
+ * - Base 64 URL Encoding without Padding
+ *
+ *   o Use flag APR_ENCODE_BASE64URL
+ *   o https://tools.ietf.org/html/rfc7515#appendix-C
+ *
+ * - Base 32 Encoding
+ *
+ *   o Use flag APR_ENCODE_NONE
+ *   o https://tools.ietf.org/html/rfc4648#section-6
+ *
+ * - Base 32 Encoding with Extended Hex Alphabet
+ *
+ *   o Use flag APR_ENCODE_BASE32HEX
+ *   o https://tools.ietf.org/html/rfc4648#section-7
+ *
+ * - Base 16 Encoding
+ *
+ *   o Use flags APR_ENCODE_NONE/APR_ENCODE_COLON
+ *   o https://tools.ietf.org/html/rfc4648#section-8
+ *
+ * If a non valid character of any kind including whitespace is passed to any
+ * of the decoder functions, APR_BADCH will be returned. In this case decoding
+ * will still take place, but the results can not be trusted.
+ *
+ * If APR_ENCODE_RELAXED is passed to the decoder functions, decoding will be
+ * attempted up until the first non valid character. If this results in an
+ * invalid state in the decoder, such as but not limited to an odd number of
+ * base16 characters, APR_BADCH will still be returned.
+ *
+ * If APR_ENCODE_RELAXED is not passed to a decoder function, the decoding will
+ * be done in constant time regardless of whether the result returns APR_SUCCESS
+ * or APR_BADCH.
+ *
+ * If the dest parameter is NULL, the maximum theoretical buffer size is
+ * returned in the len field, including space for a terminating zero character
+ * if the destination is a string. This value can be used to allocate buffers
+ * of a suitable safe size.
+ *
+ * If the dest parameter is provided, the encoding or decoding will take place,
+ * and the actual number of characters written is returned in the len field,
+ * ignoring any terminating zero.
+ *
+ * Plain strings are not assumed '\0' terminated unless APR_ENCODE_STRING is
+ * provided.
+ *
+ */
+
+/**
+ * When passing a string to one of the encode functions, this value can be
+ * passed to indicate a string-valued key, and have the length computed
+ * automatically.
+ */
+#define APR_ENCODE_STRING      (-1)
+
+/**
+ * Generate RFC4648 base16/base32/base64.
+ */
+#define APR_ENCODE_NONE 0
+
+/**
+ * If relaxed, decode up until the first non base16/base32/base64 character.
+ */
+#define APR_ENCODE_RELAXED 1
+
+/**
+ * Omit the padding character (=) while encoding.
+ */
+#define APR_ENCODE_NOPADDING 2
+
+/**
+ * Generate RFC4648 Base 64 Encoding with URL and Filename Safe Alphabet
+ */
+#define APR_ENCODE_URL 4
+
+/**
+ * Generate RFC7515 BASE64URL
+ */
+#define APR_ENCODE_BASE64URL (APR_ENCODE_NOPADDING | APR_ENCODE_URL)
+
+/**
+ * Generate base32hex encoding instead of base32 encoding
+ */
+#define APR_ENCODE_BASE32HEX 8
+
+/**
+ * Generate base16 with colons between each token.
+ */
+#define APR_ENCODE_COLON 16
+
+/**
+ * Generate base16 with lower case characters.
+ */
+#define APR_ENCODE_LOWER 32
+
+/**
+ * Convert text data to base64.
+ * @param dest The destination string, can be NULL.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 64 Encoding. If
+ *  APR_ENCODE_NOPADDING, omit the = padding character.	If APR_ENCODE_URL,
+ *  use RFC4648 Base 64 Encoding with URL and Filename Safe Alphabet.
+ * 	If APR_ENCODE_BASE64URL, use RFC7515 base64url Encoding.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination string, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL.
+ */
+APR_DECLARE(apr_status_t) apr_encode_base64(char *dest, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert binary data to base64.
+ * @param dest The destination string, can be NULL.
+ * @param src The original buffer.
+ * @param slen The length of the original buffer.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 64 Encoding. If
+ *  APR_ENCODE_NOPADDING, omit the = padding character.	If APR_ENCODE_URL,
+ *  use RFC4648 Base 64 Encoding with URL and Filename Safe Alphabet.
+ * 	If APR_ENCODE_BASE64URL, use RFC7515 base64url Encoding.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination string, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL.
+ */
+APR_DECLARE(apr_status_t) apr_encode_base64_binary(char *dest, const unsigned char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert text data to base64, and return the results from a pool.
+ * @param p Pool to allocate from.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 64 Encoding. If
+ *  APR_ENCODE_NOPADDING, omit the = padding character.	If APR_ENCODE_URL,
+ *  use RFC4648 Base 64 Encoding with URL and Filename Safe Alphabet.
+ * 	If APR_ENCODE_BASE64URL, use RFC7515 base64url Encoding.
+ * @param len If present, returns the number of characters written excluding
+ *  the zero pad.
+ * @return A zero padded string allocated from the pool on success, or
+ * NULL if src was NULL.
+ */
+APR_DECLARE(const char *)apr_pencode_base64(apr_pool_t * p, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len)__attribute__((nonnull(1)));
+
+/**
+ * Convert binary data to base64, and return the results from a pool.
+ * @param p Pool to allocate from.
+ * @param src The original buffer.
+ * @param slen The length of the original buffer.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 64 Encoding. If
+ *  APR_ENCODE_NOPADDING, omit the = padding character.	If APR_ENCODE_URL,
+ *  use RFC4648 Base 64 Encoding with URL and Filename Safe Alphabet.
+ * 	If APR_ENCODE_BASE64URL, use RFC7515 base64url Encoding.
+ * @param len If present, returns the number of characters written excluding
+ *  the zero pad.
+ * @return A zero padded string allocated from the pool on success, or
+ * NULL if src was NULL.
+ */
+APR_DECLARE(const char *)apr_pencode_base64_binary(apr_pool_t * p, const unsigned char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len)__attribute__((nonnull(1)));
+
+/**
+ * Convert base64 or base64url with or without padding to text data.
+ * @param dest The destination string, can be NULL.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, attempt to decode the full original buffer,
+ *  and return NULL if any bad character is detected. If APR_ENCODE_RELAXED,
+ *  decode until the first non base64/base64url character.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination string, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL, or APR_BADCH
+ * if a non hex character is present.
+ */
+APR_DECLARE(apr_status_t) apr_decode_base64(char *dest, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert base64 or base64url with or without padding to binary data.
+ * @param dest The destination buffer, can be NULL.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, attempt to decode the full original buffer,
+ *  and return NULL if any bad character is detected. If APR_ENCODE_RELAXED,
+ *  decode until the first non base64/base64url character.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination buffer, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the src was NULL, or APR_BADCH
+ * if a non base64 character is present.
+ */
+APR_DECLARE(apr_status_t) apr_decode_base64_binary(unsigned char *dest,
+        const char *src, apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert base64 or base64url with or without padding to text data, and
+ * return the results from a pool.
+ * @param p Pool to allocate from.
+ * @param src The base64 string to decode.
+ * @param slen The length of the base64 string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, attempt to decode the full original buffer,
+ *  and return NULL if any bad character is detected. If APR_ENCODE_RELAXED,
+ *  decode until the first non base64/base64url character.
+ * @param len If present, returns the number of characters written, excluding
+ *  the zero padding.
+ * @return A string allocated from the pool containing the result with a zero
+ *  pad. If src was NULL, or an error occurred, NULL is returned.
+ */
+APR_DECLARE(const char *)apr_pdecode_base64(apr_pool_t * p, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len)
+        __attribute__((nonnull(1)));
+
+/**
+ * Convert base64 or base64url with or without padding to binary data, and
+ * return the results from a pool.
+ * @param p Pool to allocate from.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ *  NUL terminated.
+ * @param flags If APR_ENCODE_NONE, attempt to decode the full original buffer,
+ *  and return NULL if any bad character is detected. If APR_ENCODE_RELAXED,
+ *  decode until the first non base64/base64url character.
+ * @param len If present, returns the number of characters written, excluding
+ *  the zero padding.
+ * @return A buffer allocated from the pool containing the result with a zero
+ *  pad. If src was NULL, or an error occurred, NULL is returned.
+ */
+APR_DECLARE(const unsigned char *)apr_pdecode_base64_binary(apr_pool_t * p,
+        const char *src, apr_ssize_t slen, int flags, apr_size_t * len)
+        __attribute__((nonnull(1)));
+
+/**
+ * Convert text data to base32.
+ * @param dest The destination string, can be NULL.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 32 Encoding. If
+ *  APR_ENCODE_NOPADDING, omit the = padding character.	If APR_ENCODE_BASE32HEX,
+ *  use RFC4648 base32hex Encoding.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination string, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL.
+ */
+APR_DECLARE(apr_status_t) apr_encode_base32(char *dest, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert binary data to base32.
+ * @param dest The destination string, can be NULL.
+ * @param src The original buffer.
+ * @param slen The length of the original buffer.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 32 Encoding. If
+ *  APR_ENCODE_NOPADDING, omit the = padding character.	If APR_ENCODE_BASE32HEX,
+ *  use RFC4648 base32hex Encoding.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination string, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL.
+ */
+APR_DECLARE(apr_status_t) apr_encode_base32_binary(char *dest, const unsigned char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert text data to base32, and return the results from a pool.
+ * @param p Pool to allocate from.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 32 Encoding. If
+ *  APR_ENCODE_NOPADDING, omit the = padding character.	If APR_ENCODE_BASE32HEX,
+ *  use RFC4648 base32hex Encoding.
+ * @param len If present, returns the number of characters written excluding
+ *  the zero pad.
+ * @return A zero padded string allocated from the pool on success, or
+ * NULL if src was NULL.
+ */
+APR_DECLARE(const char *)apr_pencode_base32(apr_pool_t * p, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len)
+        __attribute__((nonnull(1)));
+
+/**
+ * Convert binary data to base32, and return the results from a pool.
+ * @param p Pool to allocate from.
+ * @param src The original buffer.
+ * @param slen The length of the original buffer.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 32 Encoding. If
+ *  APR_ENCODE_NOPADDING, omit the = padding character.	If APR_ENCODE_BASE32HEX,
+ *  use RFC7515 base32hex Encoding.
+ * @param len If present, returns the number of characters written excluding
+ *  the zero pad.
+ * @return A zero padded string allocated from the pool on success, or
+ * NULL if src was NULL.
+ */
+APR_DECLARE(const char *)apr_pencode_base32_binary(apr_pool_t * p, const unsigned char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len)
+        __attribute__((nonnull(1)));
+
+/**
+ * Convert base32 or base32hex with or without padding to text data.
+ * @param dest The destination string, can be NULL.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, parse RFC4648 Base 32 Encoding. If
+ *  APR_ENCODE_BASE32HEX, use RFC4648 base32hex Encoding.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination buffer, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL, or APR_BADCH
+ * if a non base32 character is present.
+ */
+APR_DECLARE(apr_status_t) apr_decode_base32(char *dest, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert base32 or base32hex with or without padding to binary data.
+ * @param dest The destination buffer, can be NULL.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, parse RFC4648 Base 32 Encoding. If
+ *  APR_ENCODE_BASE32HEX, use RFC4648 base32hex Encoding.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination buffer, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the src was NULL, or APR_BADCH
+ * if a non base32 character is present.
+ */
+APR_DECLARE(apr_status_t) apr_decode_base32_binary(unsigned char *dest,
+        const char *src, apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert base32 or base32hex with or without padding to text data, and
+ * return the results from a pool.
+ * @param p Pool to allocate from.
+ * @param src The base32 string to decode.
+ * @param slen The length of the base32 string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, parse RFC4648 Base 32 Encoding. If
+ *  APR_ENCODE_BASE32HEX, use RFC4648 base32hex Encoding.
+ * @param len If present, returns the number of characters written, excluding
+ *  the zero padding.
+ * @return A string allocated from the pool containing the result with a zero
+ *  pad. If src was NULL, or an error occurred, NULL is returned.
+ */
+APR_DECLARE(const char *)apr_pdecode_base32(apr_pool_t * p, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len)
+        __attribute__((nonnull(1)));
+
+/**
+ * Convert base32 or base32hex with or without padding to binary data, and
+ * return the results from a pool.
+ * @param p Pool to allocate from.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ *  NUL terminated.
+ * @param flags If APR_ENCODE_NONE, parse RFC4648 Base 32 Encoding. If
+ *  APR_ENCODE_BASE32HEX, use RFC4648 base32hex Encoding.
+ * @param len If present, returns the number of characters written, excluding
+ *  the zero padding.
+ * @return A buffer allocated from the pool containing the result with a zero
+ *  pad. If src was NULL, or an error occurred, NULL is returned.
+ */
+APR_DECLARE(const unsigned char *)apr_pdecode_base32_binary(apr_pool_t * p,
+        const char *src, apr_ssize_t slen, int flags, apr_size_t * len)
+        __attribute__((nonnull(1)));
+
+/**
+ * Convert text data to base16 (hex).
+ * @param dest The destination string, can be NULL.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 16 Encoding. If
+ *  APR_ENCODE_COLON, separate each token with a colon.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination buffer, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL.
+ */
+APR_DECLARE(apr_status_t) apr_encode_base16(char *dest, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert binary data to base16 (hex).
+ * @param dest The destination string, can be NULL.
+ * @param src The original buffer.
+ * @param slen The length of the original buffer.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 16 Encoding. If
+ *  APR_ENCODE_COLON, separate each token with a colon.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination buffer, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL.
+ */
+APR_DECLARE(apr_status_t) apr_encode_base16_binary(char *dest,
+        const unsigned char *src, apr_ssize_t slen, int flags,
+        apr_size_t * len);
+
+/**
+ * Convert text data to base16 (hex), and return the results from a
+ * pool.
+ * @param p Pool to allocate from.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 16 Encoding. If
+ *  APR_ENCODE_COLON, separate each token with a colon.
+ * @param len If present, returns the number of characters written, excluding
+ *  the zero padding.
+ * @return A string allocated from the pool containing the result with a zero
+ *  pad. If src was NULL, or an error occurred, NULL is returned.
+ */
+APR_DECLARE(const char *)apr_pencode_base16(apr_pool_t * p, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len)
+        __attribute__((nonnull(1)));
+
+/**
+ * Convert binary data to base16 (hex), and return the results from a
+ * pool.
+ * @param p Pool to allocate from.
+ * @param src The original buffer.
+ * @param slen The length of the original buffer.
+ * @param flags If APR_ENCODE_NONE, emit RFC4648 Base 16 Encoding. If
+ *  APR_ENCODE_COLON, separate each token with a colon.
+ * @param len If present, returns the number of characters written, excluding
+ *  the zero padding.
+ * @return A string allocated from the pool containing the result with a zero
+ *  pad. If src was NULL, or an error occurred, NULL is returned.
+ */
+APR_DECLARE(const char *)apr_pencode_base16_binary(apr_pool_t * p,
+        const unsigned char *src, apr_ssize_t slen,
+        int flags, apr_size_t * len)__attribute__((nonnull(1)));
+
+/**
+ * Convert base16 (hex) to text data.
+ * @param dest The destination string, can be NULL.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, parse RFC4648 Base 16 Encoding. If
+ *  APR_ENCODE_COLON, allow tokens to be separated with a colon.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination buffer, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL, or APR_BADCH
+ * if a non hex character is present. A zero pad is appended to the buffer.
+ */
+APR_DECLARE(apr_status_t) apr_decode_base16(char *dest, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert base16 (hex) to binary data.
+ * @param dest The destination buffer, can be NULL.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, parse RFC4648 Base 16 Encoding. If
+ *  APR_ENCODE_COLON, allow tokens to be separated with a colon.
+ * @param len If present and src is NULL, returns the maximum possible length
+ *  of the destination buffer, including a zero pad. If present and src is
+ *  not NULL, returns the number of characters actually written.
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL, or APR_BADCH
+ * if a non hex character is present. No zero pad is written to the buffer.
+ */
+APR_DECLARE(apr_status_t) apr_decode_base16_binary(unsigned char *dest,
+        const char *src, apr_ssize_t slen, int flags, apr_size_t * len);
+
+/**
+ * Convert base16 (hex) and return the results from a pool.
+ * @param p Pool to allocate from.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, parse RFC4648 Base 16 Encoding. If
+ *  APR_ENCODE_COLON, allow tokens to be separated with a colon.
+ * @param len If present, returns the number of characters written, excluding
+ *  the zero padding.
+ * @return A buffer allocated from the pool containing the result with a zero
+ *  pad. If src was NULL, or an error occurred, NULL is returned.
+ */
+APR_DECLARE(const char *)apr_pdecode_base16(apr_pool_t * p, const char *src,
+        apr_ssize_t slen, int flags, apr_size_t * len)
+        __attribute__((nonnull(1)));
+
+/**
+ * Convert base16 (hex) to binary data, and return the results from a pool.
+ * @param p Pool to allocate from.
+ * @param src The original string.
+ * @param slen The length of the original string, or APR_ENCODE_STRING if
+ * NUL terminated.
+ * @param flags If APR_ENCODE_NONE, parse RFC4648 Base 16 Encoding. If
+ *  APR_ENCODE_COLON, allow tokens to be separated with a colon.
+ * @param len If present, returns the number of characters written, excluding
+ *  the zero padding.
+ * @return A buffer allocated from the pool containing the result with a zero
+ *  pad. If src was NULL, or an error occurred, NULL is returned.
+ */
+APR_DECLARE(const unsigned char *)apr_pdecode_base16_binary(apr_pool_t * p,
+        const char *src, apr_ssize_t slen, int flags, apr_size_t * len)
+        __attribute__((nonnull(1)));
+
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+
+#endif                          /* !APR_ENCODE_H */

Property changes on: head/contrib/apr/include/apr_encode.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/apr/include/apr_errno.h
===================================================================
--- head/contrib/apr/include/apr_errno.h	(revision 361677)
+++ head/contrib/apr/include/apr_errno.h	(revision 361678)
@@ -1,1315 +1,1342 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 to 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_UTIL_ERRSPACE_SIZE is the size of the space that is reserved for
  * use within apr-util. This space is reserved above that used by APR
  * internally.
  * @note This number MUST be smaller than APR_OS_ERRSPACE_SIZE by a
  *       large enough amount that APR has sufficient room for its
  *       codes.
  */
 #define APR_UTIL_ERRSPACE_SIZE 20000
 /**
  * APR_OS_START_STATUS is where the APR specific status codes start.
  */
 #define APR_OS_START_STATUS    (APR_OS_START_ERROR + APR_OS_ERRSPACE_SIZE)
 /**
  * APR_UTIL_START_STATUS is where APR-Util starts defining its
  * status codes.
  */
 #define APR_UTIL_START_STATUS   (APR_OS_START_STATUS + \
                            (APR_OS_ERRSPACE_SIZE - APR_UTIL_ERRSPACE_SIZE))
 /**
  * APR_OS_START_USERERR are reserved for applications that use APR that
  *     layer their own error codes along with APR's.  Note that the
  *     error immediately following this one is set ten times farther
  *     away than usual, so that users of apr have a lot of room in
  *     which to declare custom error codes.
  *
  * In general applications should try and create unique error codes. To try
  * and assist in finding suitable ranges of numbers to use, the following
  * ranges are known to be used by the listed applications. If your
  * application defines error codes please advise the range of numbers it
  * uses to dev@apr.apache.org for inclusion in this list.
  *
  * Ranges shown are in relation to APR_OS_START_USERERR
  *
  * Subversion - Defined ranges, of less than 100, at intervals of 5000
  *              starting at an offset of 5000, e.g.
  *               +5000 to 5100,  +10000 to 10100
  *
  * Apache HTTPD - +2000 to 2999
  */
 #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)
 
 /**
  * @defgroup APR_ERROR_map APR Error Space
  * <PRE>
  * The following attempts to show the relation of the various constants
  * used for mapping APR Status codes.
  *
  *       0
  *
  *  20,000     APR_OS_START_ERROR
  *
  *         + APR_OS_ERRSPACE_SIZE (50,000)
  *
  *  70,000      APR_OS_START_STATUS
  *
  *         + APR_OS_ERRSPACE_SIZE - APR_UTIL_ERRSPACE_SIZE (30,000)
  *
  * 100,000      APR_UTIL_START_STATUS
  *
  *         + APR_UTIL_ERRSPACE_SIZE (20,000)
  *
  * 120,000      APR_OS_START_USERERR
  *
  *         + 10 x APR_OS_ERRSPACE_SIZE (50,000 * 10)
  *
  * 620,000      APR_OS_START_CANONERR
  *
  *         + APR_OS_ERRSPACE_SIZE (50,000)
  *
  * 670,000      APR_OS_START_EAIERR
  *
  *         + APR_OS_ERRSPACE_SIZE (50,000)
  *
  * 720,000      APR_OS_START_SYSERR
  *
  * </PRE>
  */
 
 /** no error. */
 #define APR_SUCCESS 0
 
 /**
  * @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
  * APR_ENOTENOUGHENTROPY Not enough entropy to continue
  * </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)
 /** @see APR_STATUS_IS_ENOTENOUGHENTROPY */
 #define APR_ENOTENOUGHENTROPY (APR_OS_START_ERROR + 28)
 /** @} */
 
 /**
  * @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
  *      corresponding 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)
 /** APR could not gather enough entropy to continue. */
 #define APR_STATUS_IS_ENOTENOUGHENTROPY(s) ((s) == APR_ENOTENOUGHENTROPY)
 
 /** @} */
 
 /**
  * @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_EEXIST */
 #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
  *  @deprecated */
 #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
 
 /** @see APR_STATUS_IS_EAFNOSUPPORT */
 #ifdef EAFNOSUPPORT
 #define APR_EAFNOSUPPORT EAFNOSUPPORT
 #else
 #define APR_EAFNOSUPPORT  (APR_OS_START_CANONERR + 27)
 #endif
 
+/** @see APR_STATUS_IS_EOPNOTSUPP */
+#ifdef EOPNOTSUPP
+#define APR_EOPNOTSUPP EOPNOTSUPP
+#else
+#define APR_EOPNOTSUPP    (APR_OS_START_CANONERR + 28)
+#endif
+
+/** @see APR_STATUS_IS_ERANGE */
+#ifdef ERANGE
+#define APR_ERANGE ERANGE
+#else
+#define APR_ERANGE          (APR_OS_START_CANONERR + 29)
+#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))
 
 /* 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)
 /* XXX deprecated */
 #define APR_STATUS_IS_ETIMEDOUT(s)         ((s) == APR_ETIMEDOUT \
                 || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)
 #undef APR_STATUS_IS_TIMEUP
 #define APR_STATUS_IS_TIMEUP(s)         ((s) == APR_TIMEUP \
                 || (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)
 #define APR_STATUS_IS_EAFNOSUPPORT(s)   ((s) == APR_AFNOSUPPORT \
                 || (s) == APR_OS_START_SYSERR + SOCEAFNOSUPPORT)
+#define APR_STATUS_IS_EOPNOTSUPP(s)     ((s) == APR_EOPNOTSUPP \
+                || (s) == APR_OS_START_SYSERR + SOCEOPNOTSUPP)
+#define APR_STATUS_IS_ERANGE(s)         ((s) == APR_ERANGE)
 
 /*
     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    },
     { 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)))
 
 /* 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 \
                 || (s) == APR_OS_START_SYSERR + ERROR_DIRECTORY)
 #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)
 /* XXX deprecated */
 #define APR_STATUS_IS_ETIMEDOUT(s)         ((s) == APR_ETIMEDOUT \
                 || (s) == APR_OS_START_SYSERR + WSAETIMEDOUT \
                 || (s) == APR_OS_START_SYSERR + WAIT_TIMEOUT)
 #undef APR_STATUS_IS_TIMEUP
 #define APR_STATUS_IS_TIMEUP(s)         ((s) == APR_TIMEUP \
                 || (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)
 #define APR_STATUS_IS_EAFNOSUPPORT(s)   ((s) == APR_EAFNOSUPPORT \
                 || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT)
+#define APR_STATUS_IS_EOPNOTSUPP(s)     ((s) == APR_EOPNOTSUPP \
+                || (s) == APR_OS_START_SYSERR + WSAEOPNOTSUPP)
+#define APR_STATUS_IS_ERANGE(s)         ((s) == APR_ERANGE)
 
 #elif defined(NETWARE) && defined(USE_WINSOCK) && !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)))
 
 /* 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)
 /* XXX deprecated */
 #define APR_STATUS_IS_ETIMEDOUT(s)       ((s) == APR_ETIMEDOUT \
                 || (s) == APR_OS_START_SYSERR + WSAETIMEDOUT \
                 || (s) == APR_OS_START_SYSERR + WAIT_TIMEOUT)
 #undef APR_STATUS_IS_TIMEUP
 #define APR_STATUS_IS_TIMEUP(s)         ((s) == APR_TIMEUP \
                 || (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)
 #define APR_STATUS_IS_EAFNOSUPPORT(s)   ((s) == APR_EAFNOSUPPORT \
                 || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT)
+#define APR_STATUS_IS_EOPNOTSUPP(s)     ((s) == APR_EOPNOTSUPP \
+                || (s) == APR_OS_START_SYSERR + WSAEOPNOTSUPP)
+#define APR_STATUS_IS_ERANGE(s)         ((s) == APR_ERANGE)
 
 #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
  * @{
  */
 
 /** 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 */
 #ifdef EDQUOT
 #define APR_STATUS_IS_ENOSPC(s)         ((s) == APR_ENOSPC \
                                       || (s) == EDQUOT)
 #else
 #define APR_STATUS_IS_ENOSPC(s)         ((s) == APR_ENOSPC)
 #endif
 /** 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
  *  @deprecated */
 #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 */
+/** inappropriate 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)
 /** Address Family not supported */
 #define APR_STATUS_IS_EAFNOSUPPORT(s)    ((s) == APR_EAFNOSUPPORT)
+/** Socket operation not supported */
+#define APR_STATUS_IS_EOPNOTSUPP(s)      ((s) == APR_EOPNOTSUPP)
+
+/** Numeric value not representable */
+#define APR_STATUS_IS_ERANGE(s)         ((s) == APR_ERANGE)
 /** @} */
 
 #endif /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */
 
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  /* ! APR_ERRNO_H */
Index: head/contrib/apr/include/apr_escape.h
===================================================================
--- head/contrib/apr/include/apr_escape.h	(revision 361677)
+++ head/contrib/apr/include/apr_escape.h	(revision 361678)
@@ -1,374 +1,431 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 /**
  * @file apr_escape.h
  * @brief APR-UTIL Escaping
  */
 #ifndef APR_ESCAPE_H
 #define APR_ESCAPE_H
 #include "apr.h"
 #include "apr_general.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
  * @defgroup APR_Util_Escaping Escape functions
  * @ingroup APR
  * @{
  */
 
 /* Simple escape/unescape functions.
  *
+ * The design goal of these functions are:
+ *
+ * - Avoid unnecessary work.
+ *
+ * In most cases the strings passed in do not need to be escaped at all. In
+ * these cases the original string will be returned.
+ *
+ * - Lowest possible memory footprint.
+ *
+ * The amount of memory allocated for a given encoding is calculated based
+ * on the exact amount of memory needed, and not the theoretical worst case
+ * scenario.
+ *
  */
 
 /**
  * When passing a string to one of the escape functions, this value can be
  * passed to indicate a string-valued key, and have the length computed
  * automatically.
  */
-#define APR_ESCAPE_STRING     (-1)
+#define APR_ESCAPE_STRING      (-1)
 
 /**
+ * Apply LDAP distinguished name escaping as per RFC4514.
+ */
+#define APR_ESCAPE_LDAP_DN     (0x01)
+
+/**
+ * Apply LDAP filter escaping as per RFC4515.
+ */
+#define APR_ESCAPE_LDAP_FILTER (0x02)
+
+/**
+ * Apply both RFC4514 and RFC4515 LDAP escaping.
+ */
+#define APR_ESCAPE_LDAP_ALL    (0x03)
+
+/**
  * Perform shell escaping on the provided string.
  * 
  * Shell escaping causes characters to be prefixed with a '\' character.
  * @param escaped Optional buffer to write the encoded string, can be
  * NULL
  * @param str The original string
  * @param slen The length of the original string, or APR_ESCAPE_STRING
  * @param len If present, returns the length of the string
  * @return APR_SUCCESS, or APR_NOTFOUND if no changes to the string were
  * detected or the string was NULL
  */
 APR_DECLARE(apr_status_t) apr_escape_shell(char *escaped, const char *str,
         apr_ssize_t slen, apr_size_t *len);
 
 /**
  * Perform shell escaping on the provided string, returning the result
  * from the pool.
  *
  * Shell escaping causes characters to be prefixed with a '\' character.
  *
  * If no characters were escaped, the original string is returned.
  * @param p Pool to allocate from
  * @param str The original string
  * @return the encoded string, allocated from the pool, or the original
  * string if no escaping took place or the string was NULL.
  */
 APR_DECLARE(const char *) apr_pescape_shell(apr_pool_t *p, const char *str)
         __attribute__((nonnull(1)));
 
 /**
  * Unescapes a URL, leaving reserved characters intact.
  * @param escaped Optional buffer to write the encoded string, can be
  * NULL
  * @param url String to be unescaped
  * @param slen The length of the original url, or APR_ESCAPE_STRING
  * @param forbid Optional list of forbidden characters, in addition to
  * 0x00
  * @param reserved Optional list of reserved characters that will be
  * left unescaped
  * @param plus If non zero, '+' is converted to ' ' as per
  * application/x-www-form-urlencoded encoding
  * @param len If set, the length of the escaped string will be returned
  * @return APR_SUCCESS on success, APR_NOTFOUND if no characters are
  * decoded or the string is NULL, APR_EINVAL if a bad escape sequence is
  * found, APR_BADCH if a character on the forbid list is found.
  */
 APR_DECLARE(apr_status_t) apr_unescape_url(char *escaped, const char *url,
         apr_ssize_t slen, const char *forbid, const char *reserved, int plus,
         apr_size_t *len);
 
 /**
  * Unescapes a URL, leaving reserved characters intact, returning the
  * result from a pool.
  * @param p Pool to allocate from
  * @param url String to be unescaped in place
  * @param forbid Optional list of forbidden characters, in addition to
  * 0x00
  * @param reserved Optional list of reserved characters that will be
  * left unescaped
  * @param plus If non zero, '+' is converted to ' ' as per
  * application/x-www-form-urlencoded encoding
  * @return A string allocated from the pool on success, the original string
  * if no characters are decoded, or NULL if a bad escape sequence is found
  * or if a character on the forbid list is found, or if the original string
  * was NULL.
  */
 APR_DECLARE(const char *) apr_punescape_url(apr_pool_t *p, const char *url,
         const char *forbid, const char *reserved, int plus)
         __attribute__((nonnull(1)));
 
 /**
  * Escape a path segment, as defined in RFC1808.
  * @param escaped Optional buffer to write the encoded string, can be
  * NULL
  * @param str The original string
  * @param slen The length of the original string, or APR_ESCAPE_STRING
  * @param len If present, returns the length of the string
  * @return APR_SUCCESS, or APR_NOTFOUND if no changes to the string were
  * detected or the string was NULL
  */
 APR_DECLARE(apr_status_t) apr_escape_path_segment(char *escaped,
         const char *str, apr_ssize_t slen, apr_size_t *len);
 
 /**
  * Escape a path segment, as defined in RFC1808, returning the result from a
  * pool.
  * @param p Pool to allocate from
  * @param str String to be escaped
  * @return A string allocated from the pool on success, the original string
  * if no characters are encoded or the string is NULL.
  */
 APR_DECLARE(const char *) apr_pescape_path_segment(apr_pool_t *p,
         const char *str) __attribute__((nonnull(1)));
 
 /**
  * Converts an OS path to a URL, in an OS dependent way, as defined in RFC1808.
  * In all cases if a ':' occurs before the first '/' in the URL, the URL should
  * be prefixed with "./" (or the ':' escaped). In the case of Unix, this means
  * leaving '/' alone, but otherwise doing what escape_path_segment() does. For
  * efficiency reasons, we don't use escape_path_segment(), which is provided for
  * reference. Again, RFC 1808 is where this stuff is defined.
  *
  * If partial is set, os_escape_path() assumes that the path will be appended to
  * something with a '/' in it (and thus does not prefix "./").
  * @param escaped Optional buffer to write the encoded string, can be
  * NULL
  * @param path The original string
  * @param slen The length of the original string, or APR_ESCAPE_STRING
  * @param partial If non zero, suppresses the prepending of "./"
  * @param len If present, returns the length of the string
  * @return APR_SUCCESS, or APR_NOTFOUND if no changes to the string were
  * detected or if the string was NULL
  */
 APR_DECLARE(apr_status_t) apr_escape_path(char *escaped, const char *path,
         apr_ssize_t slen, int partial, apr_size_t *len);
 
 /**
  * Converts an OS path to a URL, in an OS dependent way, as defined in RFC1808,
  * returning the result from a pool.
  *
  * In all cases if a ':' occurs before the first '/' in the URL, the URL should
  * be prefixed with "./" (or the ':' escaped). In the case of Unix, this means
  * leaving '/' alone, but otherwise doing what escape_path_segment() does. For
  * efficiency reasons, we don't use escape_path_segment(), which is provided for
  * reference. Again, RFC 1808 is where this stuff is defined.
  *
  * If partial is set, os_escape_path() assumes that the path will be appended to
  * something with a '/' in it (and thus does not prefix "./").
  * @param p Pool to allocate from
  * @param str The original string
  * @param partial If non zero, suppresses the prepending of "./"
  * @return A string allocated from the pool on success, the original string
  * if no characters are encoded or if the string was NULL.
  */
 APR_DECLARE(const char *) apr_pescape_path(apr_pool_t *p, const char *str,
         int partial) __attribute__((nonnull(1)));
 
 /**
  * Urlencode a string, as defined in
  * http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.1.
  * @param escaped Optional buffer to write the encoded string, can be
  * NULL
  * @param str The original string
  * @param slen The length of the original string, or APR_ESCAPE_STRING
  * @param len If present, returns the length of the string
  * @return APR_SUCCESS, or APR_NOTFOUND if no changes to the string were
  * detected or if the stirng was NULL
  */
 APR_DECLARE(apr_status_t) apr_escape_urlencoded(char *escaped, const char *str,
         apr_ssize_t slen, apr_size_t *len);
 
 /**
  * Urlencode a string, as defined in
  * http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.1, returning
  * the result from a pool.
  * @param p Pool to allocate from
  * @param str String to be escaped
  * @return A string allocated from the pool on success, the original string
  * if no characters are encoded or if the string was NULL.
  */
 APR_DECLARE(const char *) apr_pescape_urlencoded(apr_pool_t *p,
         const char *str) __attribute__((nonnull(1)));
 
 /**
  * Apply entity encoding to a string. Characters are replaced as follows:
- * '<' becomes '&lt;', '>' becomes '&gt;', '&' becomes '&amp;', the
- * double quote becomes '&quot;" and the single quote becomes '&apos;'.
+ * '<' becomes '\&lt;', '>' becomes '\&gt;', '&' becomes '\&amp;', the
+ * double quote becomes '\&quot;" and the single quote becomes '\&apos;'.
  *
  * If toasc is not zero, any non ascii character will be encoded as
  * '%\#ddd;', where ddd is the decimal code of the character.
  * @param escaped Optional buffer to write the encoded string, can be
  * NULL
  * @param str The original string
  * @param slen The length of the original string, or APR_ESCAPE_STRING
  * @param toasc If non zero, encode non ascii characters
  * @param len If present, returns the length of the string
  * @return APR_SUCCESS, or APR_NOTFOUND if no changes to the string were
  * detected or the string was NULL
  */
 APR_DECLARE(apr_status_t) apr_escape_entity(char *escaped, const char *str,
         apr_ssize_t slen, int toasc, apr_size_t *len);
 
 /**
  * Apply entity encoding to a string, returning the result from a pool.
- * Characters are replaced as follows: '<' becomes '&lt;', '>' becomes
- * '&gt;', '&' becomes '&amp;', the double quote becomes '&quot;" and the
- * single quote becomes '&apos;'.
+ * Characters are replaced as follows: '<' becomes '\&lt;', '>' becomes
+ * '\&gt;', '&' becomes '\&amp;', the double quote becomes '\&quot;" and the
+ * single quote becomes '\&apos;'.
  * @param p Pool to allocate from
  * @param str The original string
  * @param toasc If non zero, encode non ascii characters
  * @return A string allocated from the pool on success, the original string
  * if no characters are encoded or the string is NULL.
  */
 APR_DECLARE(const char *) apr_pescape_entity(apr_pool_t *p, const char *str,
         int toasc) __attribute__((nonnull(1)));
 
 /**
  * Decodes html entities or numeric character references in a string. If
  * the string to be unescaped is syntactically incorrect, then the
  * following fixups will be made:
  * unknown entities will be left undecoded;
  * references to unused numeric characters will be deleted.
  * In particular, &#00; will not be decoded, but will be deleted.
  * @param unescaped Optional buffer to write the encoded string, can be
  * NULL
  * @param str The original string
  * @param slen The length of the original string, or APR_ESCAPE_STRING
  * @param len If present, returns the length of the string
  * @return APR_SUCCESS, or APR_NOTFOUND if no changes to the string were
  * detected or the string was NULL
  */
 APR_DECLARE(apr_status_t) apr_unescape_entity(char *unescaped, const char *str,
         apr_ssize_t slen, apr_size_t *len);
 
 /**
  * Decodes html entities or numeric character references in a string. If
  * the string to be unescaped is syntactically incorrect, then the
  * following fixups will be made:
  * unknown entities will be left undecoded;
  * references to unused numeric characters will be deleted.
  * In particular, &#00; will not be decoded, but will be deleted.
  * @param p Pool to allocate from
  * @param str The original string
  * @return A string allocated from the pool on success, the original string
  * if no characters are encoded or the string is NULL.
  */
 APR_DECLARE(const char *) apr_punescape_entity(apr_pool_t *p, const char *str)
         __attribute__((nonnull(1)));
 
 /**
  * Escape control characters in a string, as performed by the shell's
  * 'echo' command. Characters are replaced as follows:
  * \\a alert (bell), \\b backspace, \\f form feed, \\n new line, \\r carriage
  * return, \\t horizontal tab, \\v vertical tab, \\ backslash.
  *
  * Any non ascii character will be encoded as '\\xHH', where HH is the hex
  * code of the character.
  *
  * If quote is not zero, the double quote character will also be escaped.
  * @param escaped Optional buffer to write the encoded string, can be
  * NULL
  * @param str The original string
  * @param slen The length of the original string, or APR_ESCAPE_STRING
  * @param quote If non zero, encode double quotes
  * @param len If present, returns the length of the string
  * @return APR_SUCCESS, or APR_NOTFOUND if no changes to the string were
  * detected or the string was NULL
  */
 APR_DECLARE(apr_status_t) apr_escape_echo(char *escaped, const char *str,
         apr_ssize_t slen, int quote, apr_size_t *len);
 
 /**
  * Escape control characters in a string, as performed by the shell's
  * 'echo' command, and return the results from a pool. Characters are
  * replaced as follows: \\a alert (bell), \\b backspace, \\f form feed,
  * \\n new line, \\r carriage return, \\t horizontal tab, \\v vertical tab,
  * \\ backslash.
  *
  * Any non ascii character will be encoded as '\\xHH', where HH is the hex
  * code of the character.
  *
  * If quote is not zero, the double quote character will also be escaped.
  * @param p Pool to allocate from
  * @param str The original string
  * @param quote If non zero, encode double quotes
  * @return A string allocated from the pool on success, the original string
  * if no characters are encoded or the string is NULL.
  */
 APR_DECLARE(const char *) apr_pescape_echo(apr_pool_t *p, const char *str,
         int quote);
 
 /**
  * Convert binary data to a hex encoding.
  * @param dest The destination buffer, can be NULL
  * @param src The original buffer
  * @param srclen The length of the original buffer
  * @param colon If not zero, insert colon characters between hex digits.
  * @param len If present, returns the length of the string
  * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL
  */
 APR_DECLARE(apr_status_t) apr_escape_hex(char *dest, const void *src,
         apr_size_t srclen, int colon, apr_size_t *len);
 
 /**
  * Convert binary data to a hex encoding, and return the results from a
  * pool.
  * @param p Pool to allocate from
  * @param src The original buffer
  * @param slen The length of the original buffer
  * @param colon If not zero, insert colon characters between hex digits.
  * @return A zero padded buffer allocated from the pool on success, or
  * NULL if src was NULL.
  */
 APR_DECLARE(const char *) apr_pescape_hex(apr_pool_t *p, const void *src,
         apr_size_t slen, int colon) __attribute__((nonnull(1)));
 
 /**
  * Convert hex encoded string to binary data.
  * @param dest The destination buffer, can be NULL
  * @param str The original buffer
  * @param slen The length of the original buffer
  * @param colon If not zero, ignore colon characters between hex digits.
  * @param len If present, returns the length of the string
  * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL, or APR_BADCH
  * if a non hex character is present.
  */
 APR_DECLARE(apr_status_t) apr_unescape_hex(void *dest, const char *str,
         apr_ssize_t slen, int colon, apr_size_t *len);
 
 /**
  * Convert hex encoding to binary data, and return the results from a pool.
  * If the colon character appears between pairs of hex digits, it will be
  * ignored.
  * @param p Pool to allocate from
  * @param str The original string
  * @param colon If not zero, ignore colon characters between hex digits.
  * @param len If present, returns the length of the final buffer
  * @return A buffer allocated from the pool on success, or NULL if src was
  * NULL, or a bad character was present.
  */
 APR_DECLARE(const void *) apr_punescape_hex(apr_pool_t *p, const char *str,
         int colon, apr_size_t *len);
+
+/**
+ * Apply LDAP escaping to binary data. Characters from RFC4514 and RFC4515
+ * are escaped with their hex equivalents.
+ * @param dest The destination buffer, can be NULL
+ * @param src The original buffer
+ * @param srclen The length of the original buffer
+ * @param flags APR_ESCAPE_LDAP_DN for RFC4514, APR_ESCAPE_LDAP_FILTER for
+ * RFC4515, APR_ESCAPE_LDAP_ALL for both
+ * @param len If present, returns the length of the string
+ * @return APR_SUCCESS, or APR_NOTFOUND if the string was NULL
+ */
+APR_DECLARE(apr_status_t) apr_escape_ldap(char *dest, const void *src,
+        apr_ssize_t srclen, int flags, apr_size_t *len);
+
+/**
+ * Apply LDAP escaping to binary data, and return the results from a
+ * pool. Characters from RFC4514 and RFC4515 are escaped with their hex
+ * equivalents.
+ * @param p Pool to allocate from
+ * @param src The original buffer
+ * @param slen The length of the original buffer
+ * @param flags APR_ESCAPE_LDAP_DN for RFC4514, APR_ESCAPE_LDAP_FILTER for
+ * RFC4515, APR_ESCAPE_LDAP_ALL for both
+ * @return A zero padded buffer allocated from the pool on success, or
+ * NULL if src was NULL.
+ */
+APR_DECLARE(const char *) apr_pescape_ldap(apr_pool_t *p, const void *src,
+        apr_ssize_t slen, int flags) __attribute__((nonnull(1)));
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
 
 #endif	/* !APR_ESCAPE_H */
Index: head/contrib/apr/include/apr_file_info.h
===================================================================
--- head/contrib/apr/include/apr_file_info.h	(revision 361677)
+++ head/contrib/apr/include/apr_file_info.h	(revision 361678)
@@ -1,428 +1,428 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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.
+ * @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_FPROT_USETID      0x8000 /**< Set user id */
 #define APR_FPROT_UREAD       0x0400 /**< Read by user */
 #define APR_FPROT_UWRITE      0x0200 /**< Write by user */
 #define APR_FPROT_UEXECUTE    0x0100 /**< Execute by user */
 
 #define APR_FPROT_GSETID      0x4000 /**< Set group id */
 #define APR_FPROT_GREAD       0x0040 /**< Read by group */
 #define APR_FPROT_GWRITE      0x0020 /**< Write by group */
 #define APR_FPROT_GEXECUTE    0x0010 /**< Execute by group */
 
 #define APR_FPROT_WSTICKY     0x2000 /**< Sticky bit */
 #define APR_FPROT_WREAD       0x0004 /**< Read by others */
 #define APR_FPROT_WWRITE      0x0002 /**< Write by others */
 #define APR_FPROT_WEXECUTE    0x0001 /**< Execute by others */
 
 #define APR_FPROT_OS_DEFAULT  0x0FFF /**< use OS's default permissions */
 
 /* additional permission flags for apr_file_copy  and apr_file_append */
 #define APR_FPROT_FILE_SOURCE_PERMS 0x1000 /**< Copy source file's permissions */
     
 /* backcompat */
 #define APR_USETID     APR_FPROT_USETID     /**< @deprecated @see APR_FPROT_USETID     */
 #define APR_UREAD      APR_FPROT_UREAD      /**< @deprecated @see APR_FPROT_UREAD      */
 #define APR_UWRITE     APR_FPROT_UWRITE     /**< @deprecated @see APR_FPROT_UWRITE     */
 #define APR_UEXECUTE   APR_FPROT_UEXECUTE   /**< @deprecated @see APR_FPROT_UEXECUTE   */
 #define APR_GSETID     APR_FPROT_GSETID     /**< @deprecated @see APR_FPROT_GSETID     */
 #define APR_GREAD      APR_FPROT_GREAD      /**< @deprecated @see APR_FPROT_GREAD      */
 #define APR_GWRITE     APR_FPROT_GWRITE     /**< @deprecated @see APR_FPROT_GWRITE     */
 #define APR_GEXECUTE   APR_FPROT_GEXECUTE   /**< @deprecated @see APR_FPROT_GEXECUTE   */
 #define APR_WSTICKY    APR_FPROT_WSTICKY    /**< @deprecated @see APR_FPROT_WSTICKY    */
 #define APR_WREAD      APR_FPROT_WREAD      /**< @deprecated @see APR_FPROT_WREAD      */
 #define APR_WWRITE     APR_FPROT_WWRITE     /**< @deprecated @see APR_FPROT_WWRITE     */
 #define APR_WEXECUTE   APR_FPROT_WEXECUTE   /**< @deprecated @see APR_FPROT_WEXECUTE   */
 #define APR_OS_DEFAULT APR_FPROT_OS_DEFAULT /**< @deprecated @see APR_FPROT_OS_DEFAULT */
 #define APR_FILE_SOURCE_PERMS APR_FPROT_FILE_SOURCE_PERMS /**< @deprecated @see APR_FPROT_FILE_SOURCE_PERMS */
     
 /** @} */
 
 
 /**
  * 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 or inode-changed 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 created, or the inode 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;
     /** Unused */
     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 pool 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 *pool);
 
 /** @} */
 /**
  * @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 pool The pool to use.
  */                        
 APR_DECLARE(apr_status_t) apr_dir_open(apr_dir_t **new_dir, 
                                        const char *dirname, 
                                        apr_pool_t *pool);
 
 /**
  * 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. When no more
  *       entries are available, APR_ENOENT is returned.
  */                        
 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 
  * @bug in APR 0.9 and 1.x, this flag's behavior is undefined
  * if the rootpath is NULL or empty.  In APR 2.0 this should be
  * changed to imply NOTABSOLUTE if the rootpath is NULL or empty.
  */
 #define APR_FILEPATH_NOTABOVEROOT   0x01
 
 /** internal: Only meaningful with APR_FILEPATH_NOTABOVEROOT */
 #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 separators (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 ambiguous (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 components 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
+ * @remark Use apr_os_locale_encoding() and/or 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 */
Index: head/contrib/apr/include/apr_file_io.h
===================================================================
--- head/contrib/apr/include/apr_file_io.h	(revision 361677)
+++ head/contrib/apr/include/apr_file_io.h	(revision 361678)
@@ -1,973 +1,1005 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_FOPEN_READ       0x00001  /**< Open the file for reading */
 #define APR_FOPEN_WRITE      0x00002  /**< Open the file for writing */
 #define APR_FOPEN_CREATE     0x00004  /**< Create the file if not there */
 #define APR_FOPEN_APPEND     0x00008  /**< Append to the end of the file */
 #define APR_FOPEN_TRUNCATE   0x00010  /**< Open the file and truncate
                                          to 0 length */
 #define APR_FOPEN_BINARY     0x00020  /**< Open the file in binary mode
 				         (This flag is ignored on UNIX 
 					 because it has no meaning)*/
 #define APR_FOPEN_EXCL       0x00040  /**< Open should fail if #APR_FOPEN_CREATE
                                          and file exists. */
 #define APR_FOPEN_BUFFERED   0x00080  /**< Open the file for buffered I/O */
 #define APR_FOPEN_DELONCLOSE 0x00100  /**< Delete the file after close */
 #define APR_FOPEN_XTHREAD    0x00200  /**< Platform dependent tag to open
                                          the file for use across multiple
                                          threads */
 #define APR_FOPEN_SHARELOCK  0x00400  /**< Platform dependent support for
                                          higher level locked read/write
                                          access to support writes across
                                          process/machines */
 #define APR_FOPEN_NOCLEANUP  0x00800  /**< Do not register a cleanup
                                          when the file is opened. The
 					 apr_os_file_t handle in apr_file_t
 					 will not be closed when the pool
 					 is destroyed. */
 #define APR_FOPEN_SENDFILE_ENABLED 0x01000 /**< Advisory flag that this
                                              file should support
                                              apr_socket_sendfile operation */
 #define APR_FOPEN_LARGEFILE   0x04000 /**< Platform dependent flag to enable
                                        * large file support, see WARNING below
                                        */
 #define APR_FOPEN_SPARSE      0x08000 /**< Platform dependent flag to enable
                                        * sparse file support, see WARNING below
                                        */
 #define APR_FOPEN_NONBLOCK    0x40000 /**< Platform dependent flag to enable
                                        * non blocking file io */
 
 
 /* backcompat */
 #define APR_READ             APR_FOPEN_READ       /**< @deprecated @see APR_FOPEN_READ */
 #define APR_WRITE            APR_FOPEN_WRITE      /**< @deprecated @see APR_FOPEN_WRITE */   
 #define APR_CREATE           APR_FOPEN_CREATE     /**< @deprecated @see APR_FOPEN_CREATE */   
 #define APR_APPEND           APR_FOPEN_APPEND     /**< @deprecated @see APR_FOPEN_APPEND */   
 #define APR_TRUNCATE         APR_FOPEN_TRUNCATE   /**< @deprecated @see APR_FOPEN_TRUNCATE */   
 #define APR_BINARY           APR_FOPEN_BINARY     /**< @deprecated @see APR_FOPEN_BINARY */   
 #define APR_EXCL             APR_FOPEN_EXCL       /**< @deprecated @see APR_FOPEN_EXCL */   
 #define APR_BUFFERED         APR_FOPEN_BUFFERED   /**< @deprecated @see APR_FOPEN_BUFFERED */   
 #define APR_DELONCLOSE       APR_FOPEN_DELONCLOSE /**< @deprecated @see APR_FOPEN_DELONCLOSE */   
 #define APR_XTHREAD          APR_FOPEN_XTHREAD    /**< @deprecated @see APR_FOPEN_XTHREAD */   
 #define APR_SHARELOCK        APR_FOPEN_SHARELOCK  /**< @deprecated @see APR_FOPEN_SHARELOCK */   
 #define APR_FILE_NOCLEANUP   APR_FOPEN_NOCLEANUP  /**< @deprecated @see APR_FOPEN_NOCLEANUP */   
 #define APR_SENDFILE_ENABLED APR_FOPEN_SENDFILE_ENABLED /**< @deprecated @see APR_FOPEN_SENDFILE_ENABLED */   
 #define APR_LARGEFILE        APR_FOPEN_LARGEFILE  /**< @deprecated @see APR_FOPEN_LARGEFILE */   
 
 /** @def APR_FOPEN_LARGEFILE 
  * @warning APR_FOPEN_LARGEFILE flag only has effect on some
  * platforms where sizeof(apr_off_t) == 4.  Where implemented, it
  * allows opening and writing to a file which exceeds the size which
  * can be represented by apr_off_t (2 gigabytes).  When a file's size
  * does exceed 2Gb, apr_file_info_get() will fail with an error on the
  * descriptor, likewise apr_stat()/apr_lstat() will fail on the
  * filename.  apr_dir_read() will fail with #APR_INCOMPLETE on a
  * directory entry for a large file depending on the particular
  * APR_FINFO_* flags.  Generally, it is not recommended to use this
  * flag.
  *
  * @def APR_FOPEN_SPARSE
  * @warning APR_FOPEN_SPARSE may, depending on platform, convert a
  * normal file to a sparse file.  Some applications may be unable
  * to decipher a sparse file, so it's critical that the sparse file
  * flag should only be used for files accessed only by APR or other
  * applications known to be able to decipher them.  APR does not
  * guarantee that it will compress the file into sparse segments
  * if it was previously created and written without the sparse flag.
  * On platforms which do not understand, or on file systems which
  * cannot handle sparse files, the flag is ignored by apr_file_open().
  *
  * @def APR_FOPEN_NONBLOCK
  * @warning APR_FOPEN_NONBLOCK is not implemented on all platforms.
  * Callers should be prepared for it to fail with #APR_ENOTIMPL.
  */
 
 /** @} */
 
 /**
  * @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 */
 /** @} */
 
 /**
  * @defgroup apr_file_writev{_full} max iovec size
  * @{
  */
 #if defined(DOXYGEN)
 #define APR_MAX_IOVEC_SIZE 1024                /**< System dependent maximum 
                                                     size of an iovec array */
 #elif defined(IOV_MAX)
 #define APR_MAX_IOVEC_SIZE IOV_MAX
 #elif defined(MAX_IOVEC)
 #define APR_MAX_IOVEC_SIZE MAX_IOVEC
 #else
 #define APR_MAX_IOVEC_SIZE 1024
 #endif
 /** @} */
 
 /** File attributes */
 typedef apr_uint32_t apr_fileattrs_t;
 
 /** Type to pass as whence argument to apr_file_seek. */
 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:
  * @li #APR_FOPEN_READ           open for reading
  * @li #APR_FOPEN_WRITE          open for writing
  * @li #APR_FOPEN_CREATE         create the file if not there
  * @li #APR_FOPEN_APPEND         file ptr is set to end prior to all writes
  * @li #APR_FOPEN_TRUNCATE       set length to zero if file exists
  * @li #APR_FOPEN_BINARY         not a text file
  * @li #APR_FOPEN_BUFFERED       buffer the data.  Default is non-buffered
  * @li #APR_FOPEN_EXCL           return error if #APR_FOPEN_CREATE and file exists
  * @li #APR_FOPEN_DELONCLOSE     delete the file after closing
  * @li #APR_FOPEN_XTHREAD        Platform dependent tag to open the file
  *                               for use across multiple threads
  * @li #APR_FOPEN_SHARELOCK      Platform dependent support for higher
  *                               level locked read/write access to support
  *                               writes across process/machines
  * @li #APR_FOPEN_NOCLEANUP      Do not register a cleanup with the pool 
  *                               passed in on the @a pool argument (see below)
  * @li #APR_FOPEN_SENDFILE_ENABLED  Open with appropriate platform semantics
  *                               for sendfile operations.  Advisory only,
  *                               apr_socket_sendfile does not check this flag
  * @li #APR_FOPEN_LARGEFILE      Platform dependent flag to enable large file
  *                               support, see WARNING below 
  * @li #APR_FOPEN_SPARSE         Platform dependent flag to enable sparse file
  *                               support, see WARNING below
  * @li #APR_FOPEN_NONBLOCK       Platform dependent flag to enable
  *                               non blocking file io
  * @param perm Access permissions for file.
  * @param pool The pool to use.
  * @remark If perm is #APR_FPROT_OS_DEFAULT and the file is being created,
  * appropriate default permissions will be used.
  * @remark By default, the returned file descriptor will not be
  * inherited by child processes created by apr_proc_create().  This
  * can be changed using apr_file_inherit_set().
  */
 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 pool 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 *pool);
 
 /**
  * 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);
 
 /**
  * Create a hard link to 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)
  * @remark Both files must reside on the same device.
  */
 APR_DECLARE(apr_status_t) apr_file_link(const char *from_path, 
                                           const char *to_path);
 
 /**
  * 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_FPROT_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 (use / on all systems)
  * @param to_path The full path to the destination file (use / 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_FPROT_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.
+ * @remark Note that advanced filesystem permissions such as ACLs are not
+ * duplicated by this API. The target permissions (including duplicating the
+ * source file permissions) are assigned only when the target file does not yet
+ * exist.
  */
 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 pool 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.
  * 
  * @remark 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 *pool);
 
 /**
  * open standard output as an apr file pointer.
  * @param thefile The apr file to use as stdout.
  * @param pool The pool to allocate the file out of.
  * 
  * @remark See remarks for apr_file_open_stderr().
  */
 APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile,
                                                apr_pool_t *pool);
 
 /**
  * open standard input as an apr file pointer.
  * @param thefile The apr file to use as stdin.
  * @param pool The pool to allocate the file out of.
  * 
  * @remark See remarks for apr_file_open_stderr().
  */
 APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile,
                                               apr_pool_t *pool);
 
 /**
  * open standard error as an apr file pointer, with flags.
  * @param thefile The apr file to use as stderr.
  * @param flags The flags to open the file with. Only the 
  *              @li #APR_FOPEN_EXCL
  *              @li #APR_FOPEN_BUFFERED
  *              @li #APR_FOPEN_XTHREAD
  *              @li #APR_FOPEN_SHARELOCK 
  *              @li #APR_FOPEN_SENDFILE_ENABLED
  *              @li #APR_FOPEN_LARGEFILE
  *
  *              flags should be used. The #APR_FOPEN_WRITE flag will
  *              be set unconditionally.
  * @param pool The pool to allocate the file out of.
  * 
  * @remark See remarks for apr_file_open_stderr().
  */
 APR_DECLARE(apr_status_t) apr_file_open_flags_stderr(apr_file_t **thefile,
                                                      apr_int32_t flags,
                                                      apr_pool_t *pool);
 
 /**
  * open standard output as an apr file pointer, with flags.
  * @param thefile The apr file to use as stdout.
  * @param flags The flags to open the file with. Only the 
  *              @li #APR_FOPEN_EXCL
  *              @li #APR_FOPEN_BUFFERED
  *              @li #APR_FOPEN_XTHREAD
  *              @li #APR_FOPEN_SHARELOCK 
  *              @li #APR_FOPEN_SENDFILE_ENABLED
  *              @li #APR_FOPEN_LARGEFILE
  *
  *              flags should be used. The #APR_FOPEN_WRITE flag will
  *              be set unconditionally.
  * @param pool The pool to allocate the file out of.
  * 
  * @remark See remarks for apr_file_open_stderr().
  */
 APR_DECLARE(apr_status_t) apr_file_open_flags_stdout(apr_file_t **thefile,
                                                      apr_int32_t flags,
                                                      apr_pool_t *pool);
 
 /**
  * open standard input as an apr file pointer, with flags.
  * @param thefile The apr file to use as stdin.
  * @param flags The flags to open the file with. Only the 
  *              @li #APR_FOPEN_EXCL
  *              @li #APR_FOPEN_BUFFERED
  *              @li #APR_FOPEN_XTHREAD
  *              @li #APR_FOPEN_SHARELOCK 
  *              @li #APR_FOPEN_SENDFILE_ENABLED
  *              @li #APR_FOPEN_LARGEFILE
  *
  *              flags should be used. The #APR_FOPEN_WRITE flag will
  *              be set unconditionally.
  * @param pool The pool to allocate the file out of.
  * 
  * @remark See remarks for apr_file_open_stderr().
  */
 APR_DECLARE(apr_status_t) apr_file_open_flags_stdin(apr_file_t **thefile,
                                                      apr_int32_t flags,
                                                      apr_pool_t *pool);
 
 /**
  * Read data from the specified file.
  * @param thefile The file descriptor to read from.
  * @param buf The buffer to store the data to.
  * @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.
  *
  * @remark 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.
  *
  * @remark 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.
  *
  * @remark 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_full() 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.
  *
  * @remark 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.
  *
  * @remark #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, set to the number of bytes written.
  * 
  * @remark apr_file_write_full() 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.
  *
  * @remark 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.
  *
  * @remark #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);
 
 
 /**
  * Write data from iovec array to the specified file, ensuring that all of the
  * data is written before returning.
  * @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 apr_file_writev_full() is available even if the underlying
  * operating system doesn't provide writev().
  */
 APR_DECLARE(apr_status_t) apr_file_writev_full(apr_file_t *thefile,
                                                const struct iovec *vec,
                                                apr_size_t nvec,
                                                apr_size_t *nbytes);
 /**
  * Write 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);
 
 /**
  * Read 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);
 
 /**
  * Read a line from the 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 NUL-terminated if any characters are stored.
  *         The newline at the end of the line will not be stripped.
  */
 APR_DECLARE(apr_status_t) apr_file_gets(char *str, int len, 
                                         apr_file_t *thefile);
 
 /**
  * Write the string into the 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);
 
 /**
  * Transfer all file modified data and metadata to disk.
  * @param thefile The file descriptor to sync
  */
 APR_DECLARE(apr_status_t) apr_file_sync(apr_file_t *thefile);
 
 /**
  * Transfer all file modified data to disk.
  * @param thefile The file descriptor to sync
  */
 APR_DECLARE(apr_status_t) apr_file_datasync(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);
 
 /**
  * Give the specified apr file handle a new buffer 
  * @param thefile  The file handle that is to be modified
  * @param buffer   The buffer
  * @param bufsize  The size of the buffer
  * @remark It is possible to add a buffer to previously unbuffered
  *         file handles, the #APR_FOPEN_BUFFERED flag will be added to
  *         the file handle's flags. Likewise, with buffer=NULL and
  *         bufsize=0 arguments it is possible to make a previously
  *         buffered file handle unbuffered.
  */
 APR_DECLARE(apr_status_t) apr_file_buffer_set(apr_file_t *thefile,
                                               char * buffer,
                                               apr_size_t bufsize);
 
 /**
  * Get the size of any buffer for the specified apr file handle 
  * @param thefile  The file handle 
  */
 APR_DECLARE(apr_size_t) apr_file_buffer_size_get(apr_file_t *thefile);
 
 /**
  * Move the read/write file offset to a specified byte within a file.
  * @param thefile The file descriptor
  * @param where How to move the pointer, one of:
  *              @li #APR_SET  --  set the offset to offset
  *              @li #APR_CUR  --  add the offset to the current position 
  *              @li #APR_END  --  add the offset to the current file size 
  * @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 newly created pipe's file for reading.
  * @param out The newly created pipe's file for writing.
  * @param pool The pool to operate on.
  * @remark By default, the returned file descriptors will be inherited
  * by child processes created using apr_proc_create().  This can be
  * changed using apr_file_inherit_unset().
  * @bug  Some platforms cannot toggle between blocking and nonblocking,
  * and when passing a pipe as a standard handle to an application which
  * does not expect it, a non-blocking stream will fluxor the client app.
- * @deprecated @see apr_file_pipe_create_ex()
+ * @deprecated @see apr_file_pipe_create_pools()
  */
 APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, 
                                                apr_file_t **out,
                                                apr_pool_t *pool);
 
 /**
  * Create an anonymous pipe which portably supports async timeout options.
  * @param in The newly created pipe's file for reading.
  * @param out The newly created pipe's file for writing.
  * @param blocking one of these values defined in apr_thread_proc.h;
  *                 @li #APR_FULL_BLOCK
  *                 @li #APR_READ_BLOCK
  *                 @li #APR_WRITE_BLOCK
  *                 @li #APR_FULL_NONBLOCK
  * @param pool The pool to operate on.
  * @remark By default, the returned file descriptors will be inherited
  * by child processes created using apr_proc_create().  This can be
  * changed using apr_file_inherit_unset().
  * @remark Some platforms cannot toggle between blocking and nonblocking,
  * and when passing a pipe as a standard handle to an application which
  * does not expect it, a non-blocking stream will fluxor the client app.
  * Use this function rather than apr_file_pipe_create() to create pipes 
  * where one or both ends require non-blocking semantics.
+ * @deprecated @see apr_file_pipe_create_pools()
  */
 APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
                                                   apr_file_t **out, 
                                                   apr_int32_t blocking, 
                                                   apr_pool_t *pool);
+
+/**
+ * Create an anonymous pipe which portably supports async timeout options,
+ * placing each side of the pipe in a different pool.
+ * @param in The newly created pipe's file for reading.
+ * @param out The newly created pipe's file for writing.
+ * @param blocking one of these values defined in apr_thread_proc.h;
+ *                 @li #APR_FULL_BLOCK
+ *                 @li #APR_READ_BLOCK
+ *                 @li #APR_WRITE_BLOCK
+ *                 @li #APR_FULL_NONBLOCK
+ * @param pool_in The pool for the reading pipe.
+ * @param pool_out The pool for the writing pipe.
+ * @remark By default, the returned file descriptors will be inherited
+ * by child processes created using apr_proc_create().  This can be
+ * changed using apr_file_inherit_unset().
+ * @remark Some platforms cannot toggle between blocking and nonblocking,
+ * and when passing a pipe as a standard handle to an application which
+ * does not expect it, a non-blocking stream will fluxor the client app.
+ * Use this function rather than apr_file_pipe_create() to create pipes
+ * where one or both ends require non-blocking semantics.
+ */
+APR_DECLARE(apr_status_t) apr_file_pipe_create_pools(apr_file_t **in,
+                                                     apr_file_t **out,
+                                                     apr_int32_t blocking,
+                                                     apr_pool_t *pool_in,
+                                                     apr_pool_t *pool_out);
 
 /**
  * Create a named pipe.
  * @param filename The filename of the named pipe
  * @param perm The permissions for the newly created pipe.
  * @param pool The pool to operate on.
  */
 APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, 
                                                     apr_fileperms_t perm, 
                                                     apr_pool_t *pool);
 
 /**
  * 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 retrieving 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 associating 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.
  *
  * @warning 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
  *            @li #APR_FILE_ATTR_READONLY   - make the file readonly
  *            @li #APR_FILE_ATTR_EXECUTABLE - make the file executable
  *            @li #APR_FILE_ATTR_HIDDEN     - make the file hidden
  * @param attr_mask Mask of valid bits in attributes.
  * @param pool the pool to use.
  * @remark This function should be used in preference to explicit 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 *pool);
 
 /**
  * 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 directory.
  * @param pool the pool to use.
  */                        
 APR_DECLARE(apr_status_t) apr_dir_make(const char *path, apr_fileperms_t perm, 
                                        apr_pool_t *pool);
 
 /** 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 directory.
  * @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 pool the pool to use.
  * @remark Removing a directory which is in-use (e.g., the current working
  * directory, or during apr_dir_read, or with an open file) is not portable.
  */                        
 APR_DECLARE(apr_status_t) apr_dir_remove(const char *path, apr_pool_t *pool);
 
 /**
  * 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);
 
 /**
  * Unset a file from being inherited by child processes.
  */
 APR_DECLARE_INHERIT_UNSET(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_FOPEN_CREATE | #APR_FOPEN_READ | #APR_FOPEN_WRITE |
  *              #APR_FOPEN_EXCL | #APR_FOPEN_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.
  *
  */
 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 */
Index: head/contrib/apr/include/apr_general.h
===================================================================
--- head/contrib/apr/include/apr_general.h	(revision 361677)
+++ head/contrib/apr/include/apr_general.h	(revision 361678)
@@ -1,243 +1,244 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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) || defined(__FreeBSD__)))
 #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
 
 #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
  */
 
 /* APR_STRINGIFY is defined here, and also in apr_release.h, so wrap it */
 #ifndef APR_STRINGIFY
 /** 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
 #endif
 
 #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. It is safe to call apr_initialize several
- * times as long as apr_terminate is called the same number of times.
- * @remark See apr_app_initialize if this is an application, rather than
+ * times as long as apr_terminate() is called the same number of times.
+ * @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.
+ * @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. apr_terminate must be called once for every call to
  * apr_initialize() or apr_app_initialize().
  * @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.
+ *         @c atexit(apr_terminate) 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.
+ * @see apr_terminate2
  */
 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 
+ * 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.
+ *         developers suggest using @c 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.
+ *         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
  */
 APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char * buf, 
                                                     apr_size_t length);
 
 #endif
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  /* ! APR_GENERAL_H */
Index: head/contrib/apr/include/apr_global_mutex.h
===================================================================
--- head/contrib/apr/include/apr_global_mutex.h	(revision 361677)
+++ head/contrib/apr/include/apr_global_mutex.h	(revision 361678)
@@ -1,169 +1,195 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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
+#include "apr_time.h"
 
 #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
+ *            APR_LOCK_DEFAULT_TIMED pick the default timed mechanism
  * </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);
 
 /**
+ * Attempt to acquire the lock for the given mutex until timeout expires.
+ * If the acquisition time outs, the call returns with APR_TIMEUP.
+ * @param mutex the mutex on which to attempt the lock acquiring.
+ * @param timeout the relative timeout (microseconds).
+ * @note A negative or nul timeout means immediate attempt, returning
+ *       APR_TIMEUP without blocking if it the lock is already acquired.
+ */
+APR_DECLARE(apr_status_t) apr_global_mutex_timedlock(apr_global_mutex_t *mutex,
+                                                 apr_interval_time_t timeout);
+
+/**
  * 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);
 
 /**
  * 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_global_mutex_lockfile(apr_global_mutex_t *mutex);
 
 /**
- * Display the name of the mutex, as it relates to the actual method used
- * for the underlying apr_proc_mutex_t, if any.  NULL is returned if
- * there is no underlying apr_proc_mutex_t.
- * @param mutex the name of the mutex
+ * Get the mechanism of the mutex, as it relates to the actual method
+ * used for the underlying apr_proc_mutex_t.
+ * @param mutex the mutex to get the mechanism from.
  */
+APR_DECLARE(apr_lockmech_e) apr_global_mutex_mech(apr_global_mutex_t *mutex);
+
+/**
+ * Get the mechanism's name of the mutex, as it relates to the actual method
+ * used for the underlying apr_proc_mutex_t.
+ * @param mutex the mutex to get the mechanism's name from.
+ */
 APR_DECLARE(const char *) apr_global_mutex_name(apr_global_mutex_t *mutex);
 
 /**
+ * Set mutex permissions.
+ */
+APR_PERMS_SET_IMPLEMENT(global_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_lockfile   apr_proc_mutex_lockfile
+#define apr_global_mutex_mech       apr_proc_mutex_mech
 #define apr_global_mutex_name       apr_proc_mutex_name
+#define apr_global_mutex_perms_set  apr_proc_mutex_perms_set
 #define apr_global_mutex_pool_get   apr_proc_mutex_pool_get
 
 #endif
 
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  /* ndef APR_GLOBAL_MUTEX_H */
Index: head/contrib/apr/include/apr_hash.h
===================================================================
--- head/contrib/apr/include/apr_hash.h	(revision 361677)
+++ head/contrib/apr/include/apr_hash.h	(revision 361678)
@@ -1,282 +1,283 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 NUL 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 NUL-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;
 
 /**
  * Callback functions for calculating hash values.
  * @param key The key.
  * @param klen The length of the key, or APR_HASH_KEY_STRING to use the string 
  *             length. If APR_HASH_KEY_STRING then returns the actual key length.
  */
 typedef unsigned int (*apr_hashfunc_t)(const char *key, apr_ssize_t *klen);
 
 /**
  * The default hash function.
  */
 APR_DECLARE_NONSTD(unsigned int) apr_hashfunc_default(const char *key,
                                                       apr_ssize_t *klen);
 
 /**
  * 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);
 
 /**
  * Create a hash table with a custom hash function
  * @param pool The pool to allocate the hash table out of
  * @param hash_func A custom hash function.
  * @return The hash table just created
   */
 APR_DECLARE(apr_hash_t *) apr_hash_make_custom(apr_pool_t *pool, 
                                                apr_hashfunc_t hash_func);
 
 /**
  * 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.
+ * @remark If the value is NULL the hash entry is deleted. The key is stored as is,
+ *         and so must have a lifetime at least as long as the hash table's pool.
  */
 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
  * @return The iteration state
  * @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.
  *
  * @par Example:
  *
  * @code
  * 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;
  * }
  * @endcode
  */
 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 current entry's key from the iteration state.
  * @param hi The iteration state
  * @return The pointer to the key
  */
 APR_DECLARE(const void*) apr_hash_this_key(apr_hash_index_t *hi);
 
 /**
  * Get the current entry's key length from the iteration state.
  * @param hi The iteration state
  * @return The key length
  */
 APR_DECLARE(apr_ssize_t) apr_hash_this_key_len(apr_hash_index_t *hi);
 
 /**
  * Get the current entry's value from the iteration state.
  * @param hi The iteration state
  * @return The pointer to the value
  */
 APR_DECLARE(void*) apr_hash_this_val(apr_hash_index_t *hi);
 
 /**
  * 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);
 
 /**
  * Clear any key/value pairs in the hash table.
  * @param ht The hash table
  */
 APR_DECLARE(void) apr_hash_clear(apr_hash_t *ht);
 
 /**
  * Merge two hash tables into one new hash table. The values of the overlay
  * hash override the values of the base if both have the same key.  Both
  * hash tables must use the same hash function.
  * @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.  Both
  * hash tables must use the same hash function.
  * @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);
 
 /**
  * Declaration prototype for the iterator callback function of apr_hash_do().
  *
  * @param rec The data passed as the first argument to apr_hash_[v]do()
  * @param key The key from this iteration of the hash table
  * @param klen The key length from this iteration of the hash table
  * @param value The value from this iteration of the hash table
  * @remark Iteration continues while this callback function returns non-zero.
  * To export the callback function for apr_hash_do() it must be declared 
  * in the _NONSTD convention.
  */
 typedef int (apr_hash_do_callback_fn_t)(void *rec, const void *key,
                                                    apr_ssize_t klen,
                                                    const void *value);
 
 /** 
  * Iterate over a hash table running the provided function once for every
  * element in the hash table. The @param comp function will be invoked for
  * every element in the hash table.
  *
  * @param comp The function to run
  * @param rec The data to pass as the first argument to the function
  * @param ht The hash table to iterate over
  * @return FALSE if one of the comp() iterations returned zero; TRUE if all
  *            iterations returned non-zero
  * @see apr_hash_do_callback_fn_t
  */
 APR_DECLARE(int) apr_hash_do(apr_hash_do_callback_fn_t *comp,
                              void *rec, const apr_hash_t *ht);
 
 /**
  * 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 */
Index: head/contrib/apr/include/apr_network_io.h
===================================================================
--- head/contrib/apr/include/apr_network_io.h	(revision 361677)
+++ head/contrib/apr/include/apr_network_io.h	(revision 361678)
@@ -1,879 +1,951 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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" 
+#include "apr_perms_set.h"
 
 #if APR_HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#if APR_HAVE_SYS_UN_H
+#include <sys/un.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 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_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 APR_TCP_DEFER_ACCEPT 32768 /**< Delay accepting of new connections 
                                     * until data is available.
                                     * @see apr_socket_accept_filter
                                     */
 #define APR_SO_BROADCAST     65536 /**< Allow broadcast
                                     */
+#define APR_SO_FREEBIND     131072 /**< Allow binding to addresses not owned
+                                    * by any interface
+                                    */
 
 /** @} */
 
 /** 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_INADDR_NONE
  * Not all platforms have a real INADDR_NONE.  This macro replaces
  * INADDR_NONE on all platforms.
  */
 #ifdef INADDR_NONE
 #define APR_INADDR_NONE INADDR_NONE
 #else
 #define APR_INADDR_NONE ((unsigned int) 0xffffffff)
 #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
 /** @def APR_INET6
 * IPv6 Address Family. Not all platforms may have this defined.
 */
 
 #define APR_INET6    AF_INET6
 #endif
 
+#if APR_HAVE_SOCKADDR_UN
+#if defined (AF_UNIX)
+#define APR_UNIX    AF_UNIX
+#elif defined(AF_LOCAL)
+#define APR_UNIX    AF_LOCAL
+#else
+#error "Neither AF_UNIX nor AF_LOCAL is defined"
+#endif
+#else /* !APR_HAVE_SOCKADDR_UN */
+#if defined (AF_UNIX)
+#define APR_UNIX    AF_UNIX
+#elif defined(AF_LOCAL)
+#define APR_UNIX    AF_LOCAL
+#else
+/* TODO: Use a smarter way to detect unique APR_UNIX value */
+#define APR_UNIX    1234
+#endif
+#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 used to denote either the local and remote endpoint of a
  * connection.
  */
 typedef enum {
     APR_LOCAL,   /**< Socket information for local end of connection */
     APR_REMOTE   /**< Socket information for remote end of connection */
 } 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;
     /** 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;
     /** 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
 #if APR_HAVE_SA_STORAGE
         /** Placeholder to ensure that the size of this union is not
          * dependent on whether APR_HAVE_IPV6 is defined. */
         struct sockaddr_storage sas;
 #endif
+#if APR_HAVE_SOCKADDR_UN
+        /** Unix domain socket sockaddr structure */
+        struct sockaddr_un unx;
+#endif
     } sa;
 };
 
 #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.
  * @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 for the apr_socket_t and associated storage.
  * @note The pool will be used by various functions that operate on the
  *       socket. The caller must ensure that it is not used by other threads
  *       at the same time.
  */
 APR_DECLARE(apr_status_t) apr_socket_create(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);
 
 /**
  * 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);
 
 /**
  * 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);
 
 /**
  * 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.
  * @note The pool will be used by various functions that operate on the
  *       socket. The caller must ensure that it is not used by other threads
  *       at the same time.
  */
 APR_DECLARE(apr_status_t) apr_socket_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.
  */
 APR_DECLARE(apr_status_t) apr_socket_connect(apr_socket_t *sock,
                                              apr_sockaddr_t *sa);
 
 /**
  * Determine whether the receive part of the socket has been closed by
  * the peer (such that a subsequent call to apr_socket_read would
  * return APR_EOF), if the socket's receive buffer is empty.  This
  * function does not block waiting for I/O.
  *
  * @param sock The socket to check
  * @param atreadeof If APR_SUCCESS is returned, *atreadeof is set to
  *                  non-zero if a subsequent read would return APR_EOF
  * @return an error is returned if it was not possible to determine the
  *         status, in which case *atreadeof is not changed.
  */
 APR_DECLARE(apr_status_t) apr_socket_atreadeof(apr_socket_t *sock,
                                                int *atreadeof);
 
 /**
  * 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 ::
+ *               or in case of APR_UNIX family it is absolute socket filename.
  * @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);
 
 /**
+ * Copy apr_sockaddr_t src to dst on pool p.
+ * @param dst The destination apr_sockaddr_t.
+ * @param src The source apr_sockaddr_t.
+ * @param p The pool for the apr_sockaddr_t and associated storage.
+ */
+APR_DECLARE(apr_status_t) apr_sockaddr_info_copy(apr_sockaddr_t **dst,
+                                                 const apr_sockaddr_t *src,
+                                                 apr_pool_t *p);
+
+/* Set the zone of an IPv6 link-local address object.
+ * @param sa Socket address object
+ * @param zone_id Zone ID (textual "eth0" or numeric "3").
+ * @return Returns APR_EBADIP for non-IPv6 socket or an IPv6 address
+ * which isn't link-local.
+ */
+APR_DECLARE(apr_status_t) apr_sockaddr_zone_set(apr_sockaddr_t *sa,
+                                                const char *zone_id);
+
+
+/* Retrieve the zone of an IPv6 link-local address object.
+ * @param sa Socket address object
+ * @param name If non-NULL, set to the textual representation of the zone id
+ * @param id If non-NULL, set to the integer zone id
+ * @param p Pool from which *name is allocated if used.
+ * @return Returns APR_EBADIP for non-IPv6 socket or socket without any zone id
+ * set, or other error if the interface could not be mapped to a name.
+ * @remark Both name and id may be NULL, neither are modified if
+ * non-NULL in error cases.
+ */
+APR_DECLARE(apr_status_t) apr_sockaddr_zone_get(const apr_sockaddr_t *sa,
+                                                const char **name,
+                                                apr_uint32_t *id,
+                                                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.
  * @remark Results can vary significantly between platforms
  * when processing wildcard socket addresses.
  */
 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() or the APR_SO_NONBLOCK
  * socket option.
  *
  * 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);
 
 /**
  * Send multiple buffers 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() or the APR_SO_NONBLOCK
  * socket option.
  * The number of bytes actually sent is stored in argument 4.
  *
  * 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);
 
 /**
  * @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);
 
 /**
  * Read data from a socket.  On success, the address of the peer from
  * which the data was sent is copied into the @a from parameter, and the
  * @a len parameter is updated to give the number of bytes written to
  * @a buf.
  *
  * @param from Updated with the address from which the data was received
  * @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);
  
 #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() or the
  *         APR_SO_NONBLOCK socket option.
  * The number of bytes actually sent is stored in the len parameter.
  * The offset parameter is passed by reference for no reason; its
  * value will never be modified by the apr_socket_sendfile() function.
  */
 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);
 
 #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() or the APR_SO_NONBLOCK
  * socket option.
  * The number of bytes actually received 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);
 
 /**
  * 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
  *                                  When this option is enabled, use
  *                                  the APR_STATUS_IS_EAGAIN() macro to
  *                                  see if a send or receive function
  *                                  could not transfer data without
  *                                  blocking.
  *            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_FREEBIND   --  Allow binding to non-local IP address.
  * </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);
 
 /**
  * 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);
 
 /**
  * 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 address associated with a socket; either the address to
  * which the socket is bound locally or the address of the peer
  * to which the socket is connected.
  * @param sa The returned apr_sockaddr_t.
  * @param which Whether to retrieve the local or remote address
  * @param sock The socket to use
  */
 APR_DECLARE(apr_status_t) apr_socket_addr_get(apr_sockaddr_t **sa,
                                               apr_interface_e which,
                                               apr_socket_t *sock);
  
 /**
  * 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);
 
 /**
  * Write the IP address (in numeric address string format) of the APR
  * socket address @a sockaddr into the buffer @a buf (of size @a buflen).
  * @param sockaddr The socket address to reference.
  */
 APR_DECLARE(apr_status_t) apr_sockaddr_ip_getbuf(char *buf, apr_size_t buflen,
                                                  apr_sockaddr_t *sockaddr);
 
 /**
  * See if the IP addresses in two APR socket addresses are
  * equivalent.  Appropriate logic is present for comparing
  * IPv4-mapped IPv6 addresses with IPv4 addresses.
  *
  * @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);
 
 /**
  * See if the IP address in an APR socket address refers to the wildcard
  * address for the protocol family (e.g., INADDR_ANY for IPv4).
  *
  * @param addr The APR socket address to examine.
  * @remark The return value will be non-zero if the address is
  * initialized and is the wildcard address.
  */
 APR_DECLARE(int) apr_sockaddr_is_wildcard(const apr_sockaddr_t *addr);
 
 /**
 * Return the type of the socket.
 * @param sock The socket to query.
 * @param type The returned type (e.g., SOCK_STREAM).
 */
 APR_DECLARE(apr_status_t) apr_socket_type_get(apr_socket_t *sock,
                                               int *type);
  
 /**
  * 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. 
  * @bug name and args should have been declared as const char *, as they are in
  * APR 2.0
  */
 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);
 
 /**
  * Get the pool used by the socket.
  */
 APR_POOL_DECLARE_ACCESSOR(socket);
 
 /**
  * Set a socket to be inherited by child processes.
  */
 APR_DECLARE_INHERIT_SET(socket);
 
 /**
  * Unset a socket from being inherited by child processes.
  */
 APR_DECLARE_INHERIT_UNSET(socket);
+
+/**
+ * Set socket permissions.
+ */
+APR_PERMS_SET_IMPLEMENT(socket);
 
 /**
  * @defgroup apr_mcast IP Multicast
  * @{
  */
 
 /**
  * Join a Multicast Group
  * @param sock The socket to join a multicast group
  * @param join The address of the multicast group to join
  * @param iface Address of the interface to use.  If NULL is passed, the 
  *              default multicast interface will be used. (OS Dependent)
  * @param source Source Address to accept transmissions from (non-NULL 
  *               implies Source-Specific Multicast)
  */
 APR_DECLARE(apr_status_t) apr_mcast_join(apr_socket_t *sock,
                                          apr_sockaddr_t *join,
                                          apr_sockaddr_t *iface,
                                          apr_sockaddr_t *source);
 
 /**
  * Leave a Multicast Group.  All arguments must be the same as
  * apr_mcast_join.
  * @param sock The socket to leave a multicast group
  * @param addr The address of the multicast group to leave
  * @param iface Address of the interface to use.  If NULL is passed, the 
  *              default multicast interface will be used. (OS Dependent)
  * @param source Source Address to accept transmissions from (non-NULL 
  *               implies Source-Specific Multicast)
  */
 APR_DECLARE(apr_status_t) apr_mcast_leave(apr_socket_t *sock,
                                           apr_sockaddr_t *addr,
                                           apr_sockaddr_t *iface,
                                           apr_sockaddr_t *source);
 
 /**
  * Set the Multicast Time to Live (ttl) for a multicast transmission.
  * @param sock The socket to set the multicast ttl
  * @param ttl Time to live to Assign. 0-255, default=1
  * @remark If the TTL is 0, packets will only be seen by sockets on 
  * the local machine, and only when multicast loopback is enabled.
  */
 APR_DECLARE(apr_status_t) apr_mcast_hops(apr_socket_t *sock,
                                          apr_byte_t ttl);
 
 /**
  * Toggle IP Multicast Loopback
  * @param sock The socket to set multicast loopback
  * @param opt 0=disable, 1=enable
  */
 APR_DECLARE(apr_status_t) apr_mcast_loopback(apr_socket_t *sock,
                                              apr_byte_t opt);
 
 
 /**
  * Set the Interface to be used for outgoing Multicast Transmissions.
  * @param sock The socket to set the multicast interface on
  * @param iface Address of the interface to use for Multicast
  */
 APR_DECLARE(apr_status_t) apr_mcast_interface(apr_socket_t *sock,
                                               apr_sockaddr_t *iface);
 
 /** @} */
 
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  /* ! APR_NETWORK_IO_H */
 
Index: head/contrib/apr/include/apr_perms_set.h
===================================================================
--- head/contrib/apr/include/apr_perms_set.h	(nonexistent)
+++ head/contrib/apr/include/apr_perms_set.h	(revision 361678)
@@ -0,0 +1,65 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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_PERMS_SET_H
+#define APR_PERMS_SET_H
+
+/**
+ * @file apr_perms_set.h
+ * @brief APR Process Locking Routines
+ */
+
+#include "apr.h"
+#include "apr_pools.h"
+#include "apr_errno.h"
+#include "apr_user.h"
+#include "apr_file_info.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @defgroup apr_perms_set Object permission set functions
+ * @ingroup APR 
+ * @{
+ */
+
+/** Permission set callback function. */
+typedef apr_status_t (apr_perms_setfn_t)(void *object, apr_fileperms_t perms,
+                                         apr_uid_t uid, apr_gid_t gid);
+
+#define APR_PERMS_SET_IMPLEMENT(type) \
+    APR_DECLARE(apr_status_t) apr_##type##_perms_set \
+        (void *the##type, apr_fileperms_t perms, \
+         apr_uid_t uid, apr_gid_t gid)
+
+#define APR_PERMS_SET_ENOTIMPL(type) \
+    APR_DECLARE(apr_status_t) apr_##type##_perms_set \
+        (void *the##type, apr_fileperms_t perms, \
+         apr_uid_t uid, apr_gid_t gid) \
+        { return APR_ENOTIMPL ; }
+
+#define APR_PERMS_SET_FN(type) apr_##type##_perms_set
+
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* ! APR_PERMS_SET */

Property changes on: head/contrib/apr/include/apr_perms_set.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/apr/include/apr_poll.h
===================================================================
--- head/contrib/apr/include/apr_poll.h	(revision 361677)
+++ head/contrib/apr/include/apr_poll.h	(revision 361678)
@@ -1,417 +1,446 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #ifndef APR_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 pollopts Poll options
  * @ingroup apr_poll
  * @{
  */
 #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     /**< Descriptor invalid */
 /** @} */
 
 /**
  * @defgroup pollflags Pollset Flags
  * @ingroup apr_poll
  * @{
  */
 #define APR_POLLSET_THREADSAFE 0x001 /**< Adding or removing a descriptor is
                                       * thread-safe
                                       */
 #define APR_POLLSET_NOCOPY     0x002 /**< Descriptors passed to apr_pollset_add()
                                       * are not copied
                                       */
 #define APR_POLLSET_WAKEABLE   0x004 /**< Poll operations are interruptable by
-                                      * apr_pollset_wakeup()
+                                      * apr_pollset_wakeup() or apr_pollcb_wakeup()
                                       */
 #define APR_POLLSET_NODEFAULT  0x010 /**< Do not try to use the default method if
                                       * the specified non-default method cannot be
                                       * used
                                       */
 /** @} */
 
 /**
  * Pollset Methods
  */
 typedef enum {
     APR_POLLSET_DEFAULT,        /**< Platform default poll method */
     APR_POLLSET_SELECT,         /**< Poll uses select method */
     APR_POLLSET_KQUEUE,         /**< Poll uses kqueue method */
     APR_POLLSET_PORT,           /**< Poll uses Solaris event port method */
     APR_POLLSET_EPOLL,          /**< Poll uses epoll method */
     APR_POLLSET_POLL,           /**< Poll uses poll method */
     APR_POLLSET_AIO_MSGQ        /**< Poll uses z/OS asio method */
 } apr_pollset_method_e;
 
 /** 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           /**< @deprecated 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 */
 };
 
 
 /* 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;
 
 /**
  * Set up 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.
  *
  * @remark If flags contains APR_POLLSET_THREADSAFE, then a pollset is
  *         created on which it is safe to make concurrent calls to
  *         apr_pollset_add(), apr_pollset_remove() and apr_pollset_poll()
  *         from separate threads.  This feature is only supported on some
  *         platforms; the apr_pollset_create() call will fail with
  *         APR_ENOTIMPL on platforms where it is not supported.
  * @remark If flags contains APR_POLLSET_WAKEABLE, then a pollset is
  *         created with an additional internal pipe object used for the
  *         apr_pollset_wakeup() call. The actual size of pollset is
  *         in that case @a size + 1. This feature is only supported on some
  *         platforms; the apr_pollset_create() call will fail with
  *         APR_ENOTIMPL on platforms where it is not supported.
  * @remark If flags contains APR_POLLSET_NOCOPY, then the apr_pollfd_t
  *         structures passed to apr_pollset_add() are not copied and
  *         must have a lifetime at least as long as the pollset.
  * @remark Some poll methods (including APR_POLLSET_KQUEUE,
  *         APR_POLLSET_PORT, and APR_POLLSET_EPOLL) do not have a
  *         fixed limit on the size of the pollset. For these methods,
  *         the size parameter controls the maximum number of
  *         descriptors that will be returned by a single call to
  *         apr_pollset_poll().
  */
 APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
                                              apr_uint32_t size,
                                              apr_pool_t *p,
                                              apr_uint32_t flags);
 
 /**
  * Set up 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.
  * @param method Poll method to use. See #apr_pollset_method_e.  If this
  *         method cannot be used, the default method will be used unless the
  *         APR_POLLSET_NODEFAULT flag has been specified.
  *
  * @remark If flags contains APR_POLLSET_THREADSAFE, then a pollset is
  *         created on which it is safe to make concurrent calls to
  *         apr_pollset_add(), apr_pollset_remove() and apr_pollset_poll()
  *         from separate threads.  This feature is only supported on some
  *         platforms; the apr_pollset_create_ex() call will fail with
  *         APR_ENOTIMPL on platforms where it is not supported.
  * @remark If flags contains APR_POLLSET_WAKEABLE, then a pollset is
  *         created with additional internal pipe object used for the
  *         apr_pollset_wakeup() call. The actual size of pollset is
  *         in that case size + 1. This feature is only supported on some
  *         platforms; the apr_pollset_create_ex() call will fail with
  *         APR_ENOTIMPL on platforms where it is not supported.
  * @remark If flags contains APR_POLLSET_NOCOPY, then the apr_pollfd_t
  *         structures passed to apr_pollset_add() are not copied and
  *         must have a lifetime at least as long as the pollset.
  * @remark Some poll methods (including APR_POLLSET_KQUEUE,
  *         APR_POLLSET_PORT, and APR_POLLSET_EPOLL) do not have a
  *         fixed limit on the size of the pollset. For these methods,
  *         the size parameter controls the maximum number of
  *         descriptors that will be returned by a single call to
  *         apr_pollset_poll().
  */
 APR_DECLARE(apr_status_t) apr_pollset_create_ex(apr_pollset_t **pollset,
                                                 apr_uint32_t size,
                                                 apr_pool_t *p,
                                                 apr_uint32_t flags,
                                                 apr_pollset_method_e method);
 
 /**
  * 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().
  * @remark If the pollset has been created with APR_POLLSET_THREADSAFE
  *         and thread T1 is blocked in a call to apr_pollset_poll() for
  *         this same pollset that is being modified via apr_pollset_add()
  *         in thread T2, the currently executing apr_pollset_poll() call in
  *         T1 will either: (1) automatically include the newly added descriptor
  *         in the set of descriptors it is watching or (2) return immediately
  *         with APR_EINTR.  Option (1) is recommended, but option (2) is
  *         allowed for implementations where option (1) is impossible
  *         or impractical.
  * @remark If the pollset has been created with APR_POLLSET_NOCOPY, the 
  *         apr_pollfd_t structure referenced by descriptor will not be copied
  *         and must have a lifetime at least as long as the pollset.
  * @remark Do not add the same socket or file descriptor to the same pollset
  *         multiple times, even if the requested events differ for the 
  *         different calls to apr_pollset_add().  If the events of interest
  *         for a descriptor change, you must first remove the descriptor 
  *         from the pollset with apr_pollset_remove(), then add it again 
  *         specifying all requested events.
  */
 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
  * @remark If the descriptor is not found, APR_NOTFOUND is returned.
  * @remark If the pollset has been created with APR_POLLSET_THREADSAFE
  *         and thread T1 is blocked in a call to apr_pollset_poll() for
  *         this same pollset that is being modified via apr_pollset_remove()
  *         in thread T2, the currently executing apr_pollset_poll() call in
  *         T1 will either: (1) automatically exclude the newly added descriptor
  *         in the set of descriptors it is watching or (2) return immediately
  *         with APR_EINTR.  Option (1) is recommended, but option (2) is
  *         allowed for implementations where option (1) is impossible
  *         or impractical.
  * @remark apr_pollset_remove() cannot be used to remove a subset of requested
  *         events for a descriptor.  The reqevents field in the apr_pollfd_t
  *         parameter must contain the same value when removing as when adding.
  */
 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 The amount of time in microseconds to wait.  This is a
  *                maximum, not a minimum.  If a descriptor is signalled, the
  *                function will return before this time.  If timeout is
  *                negative, the function will block until a descriptor is
  *                signalled or until apr_pollset_wakeup() has been called.
  * @param num Number of signalled descriptors (output parameter)
  * @param descriptors Array of signalled descriptors (output parameter)
  * @remark APR_EINTR will be returned if the pollset has been created with
  *         APR_POLLSET_WAKEABLE, apr_pollset_wakeup() has been called while
  *         waiting for activity, and there were no signalled descriptors at the
  *         time of the wakeup call.
  * @remark Multiple signalled conditions for the same descriptor may be reported
  *         in one or more returned apr_pollfd_t structures, depending on the
  *         implementation.
  */
 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);
 
 /**
  * Interrupt the blocked apr_pollset_poll() call.
  * @param pollset The pollset to use
  * @remark If the pollset was not created with APR_POLLSET_WAKEABLE the
  *         return value is APR_EINIT.
  */
 APR_DECLARE(apr_status_t) apr_pollset_wakeup(apr_pollset_t *pollset);
 
 /**
  * Poll the descriptors in the poll structure
  * @param aprset The poll structure we will be using. 
  * @param numsock The number of descriptors we are polling
  * @param nsds The number of descriptors signalled (output parameter)
  * @param timeout The amount of time in microseconds to wait.  This is a
  *                maximum, not a minimum.  If a descriptor is signalled, the
  *                function will return before this time.  If timeout is
  *                negative, the function will block until a descriptor is
  *                signalled or until apr_pollset_wakeup() has been called.
  * @remark The number of descriptors signalled is returned in the third argument. 
  *         This is a blocking call, and it will not return until either a 
  *         descriptor has been signalled or the timeout has expired. 
  * @remark The rtnevents field in the apr_pollfd_t array will only be filled-
  *         in if the return value is APR_SUCCESS.
  */
 APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, apr_int32_t numsock,
                                    apr_int32_t *nsds, 
                                    apr_interval_time_t timeout);
 
 /**
  * Return a printable representation of the pollset method.
  * @param pollset The pollset to use
  */
 APR_DECLARE(const char *) apr_pollset_method_name(apr_pollset_t *pollset);
 
 /**
  * Return a printable representation of the default pollset method
  * (APR_POLLSET_DEFAULT).
  */
 APR_DECLARE(const char *) apr_poll_method_defname(void);
 
 /** Opaque structure used for pollcb API */
 typedef struct apr_pollcb_t apr_pollcb_t;
 
 /**
  * Set up a pollcb object
  * @param pollcb  The pointer in which to return the newly created object 
  * @param size The maximum number of descriptors that a single _poll can return.
  * @param p The pool from which to allocate the pollcb
  * @param flags Optional flags to modify the operation of the pollcb.
  *
+ * @remark If flags contains APR_POLLSET_WAKEABLE, then a pollcb is
+ *         created with an additional internal pipe object used for the
+ *         apr_pollcb_wakeup() call. The actual size of pollcb is
+ *         in that case @a size + 1.
  * @remark Pollcb is only supported on some platforms; the apr_pollcb_create()
- * call will fail with APR_ENOTIMPL on platforms where it is not supported.
+ *         call will fail with APR_ENOTIMPL on platforms where it is not supported.
  */
 APR_DECLARE(apr_status_t) apr_pollcb_create(apr_pollcb_t **pollcb,
                                             apr_uint32_t size,
                                             apr_pool_t *p,
                                             apr_uint32_t flags);
 
 /**
  * Set up a pollcb object
  * @param pollcb  The pointer in which to return the newly created object 
  * @param size The maximum number of descriptors that a single _poll can return.
  * @param p The pool from which to allocate the pollcb
  * @param flags Optional flags to modify the operation of the pollcb.
  * @param method Poll method to use. See #apr_pollset_method_e.  If this
  *         method cannot be used, the default method will be used unless the
  *         APR_POLLSET_NODEFAULT flag has been specified.
  *
+ * @remark If flags contains APR_POLLSET_WAKEABLE, then a pollcb is
+ *         created with an additional internal pipe object used for the
+ *         apr_pollcb_wakeup() call. The actual size of pollcb is
+ *         in that case @a size + 1.
  * @remark Pollcb is only supported on some platforms; the apr_pollcb_create_ex()
- * call will fail with APR_ENOTIMPL on platforms where it is not supported.
+ *         call will fail with APR_ENOTIMPL on platforms where it is not supported.
  */
 APR_DECLARE(apr_status_t) apr_pollcb_create_ex(apr_pollcb_t **pollcb,
                                                apr_uint32_t size,
                                                apr_pool_t *p,
                                                apr_uint32_t flags,
                                                apr_pollset_method_e method);
 
 /**
  * Add a socket or file descriptor to a pollcb
  * @param pollcb The pollcb to which to add the descriptor
  * @param descriptor The descriptor to add
  * @remark If you set client_data in the descriptor, that value will be
  *         returned in the client_data field whenever this descriptor is
  *         signalled in apr_pollcb_poll().
  * @remark Unlike the apr_pollset API, the descriptor is not copied, and users 
  *         must retain the memory used by descriptor, as the same pointer will
  *         be returned to them from apr_pollcb_poll.
  * @remark Do not add the same socket or file descriptor to the same pollcb
  *         multiple times, even if the requested events differ for the 
  *         different calls to apr_pollcb_add().  If the events of interest
  *         for a descriptor change, you must first remove the descriptor 
  *         from the pollcb with apr_pollcb_remove(), then add it again 
  *         specifying all requested events.
  */
 APR_DECLARE(apr_status_t) apr_pollcb_add(apr_pollcb_t *pollcb,
                                          apr_pollfd_t *descriptor);
 /**
  * Remove a descriptor from a pollcb
  * @param pollcb The pollcb from which to remove the descriptor
  * @param descriptor The descriptor to remove
+ * @remark If the descriptor is not found, APR_NOTFOUND is returned.
  * @remark apr_pollcb_remove() cannot be used to remove a subset of requested
  *         events for a descriptor.  The reqevents field in the apr_pollfd_t
  *         parameter must contain the same value when removing as when adding.
  */
 APR_DECLARE(apr_status_t) apr_pollcb_remove(apr_pollcb_t *pollcb,
                                             apr_pollfd_t *descriptor);
 
-/** Function prototype for pollcb handlers 
+/**
+ * Function prototype for pollcb handlers 
  * @param baton Opaque baton passed into apr_pollcb_poll()
- * @param descriptor Contains the notification for an active descriptor, 
- *                   the rtnevents member contains what events were triggered
+ * @param descriptor Contains the notification for an active descriptor. 
+ *                   The @a rtnevents member describes which events were triggered
  *                   for this descriptor.
+ * @remark If the pollcb handler does not return APR_SUCCESS, the apr_pollcb_poll()
+ *         call returns with the handler's return value.
  */
 typedef apr_status_t (*apr_pollcb_cb_t)(void *baton, apr_pollfd_t *descriptor);
 
 /**
  * Block for activity on the descriptor(s) in a pollcb
  * @param pollcb The pollcb to use
  * @param timeout The amount of time in microseconds to wait.  This is a
  *                maximum, not a minimum.  If a descriptor is signalled, the
  *                function will return before this time.  If timeout is
  *                negative, the function will block until a descriptor is
- *                signalled.
+ *                signalled or until apr_pollcb_wakeup() has been called.
  * @param func Callback function to call for each active descriptor.
  * @param baton Opaque baton passed to the callback function.
  * @remark Multiple signalled conditions for the same descriptor may be reported
  *         in one or more calls to the callback function, depending on the
  *         implementation.
+ * @remark APR_EINTR will be returned if the pollset has been created with
+ *         APR_POLLSET_WAKEABLE and apr_pollcb_wakeup() has been called while
+ *         waiting for activity.
  */
 APR_DECLARE(apr_status_t) apr_pollcb_poll(apr_pollcb_t *pollcb,
                                           apr_interval_time_t timeout,
                                           apr_pollcb_cb_t func,
-                                          void *baton); 
+                                          void *baton);
+
+/**
+ * Interrupt the blocked apr_pollcb_poll() call.
+ * @param pollcb The pollcb to use
+ * @remark If the pollcb was not created with APR_POLLSET_WAKEABLE the
+ *         return value is APR_EINIT.
+ */
+APR_DECLARE(apr_status_t) apr_pollcb_wakeup(apr_pollcb_t *pollcb);
+
+/**
+ * Return a printable representation of the pollcb method.
+ * @param pollcb The pollcb to use
+ */
+APR_DECLARE(const char *) apr_pollcb_method_name(apr_pollcb_t *pollcb);
 
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  /* ! APR_POLL_H */
 
Index: head/contrib/apr/include/apr_portable.h
===================================================================
--- head/contrib/apr/include/apr_portable.h	(revision 361677)
+++ head/contrib/apr/include/apr_portable.h	(revision 361678)
@@ -1,508 +1,549 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 dependent 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
+#if APR_HAVE_SEMAPHORE_H
+#include <semaphore.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
     /** Value used for SYS V Semaphore, FCNTL and FLOCK serialization */
     int crossproc;
 #endif
 #if APR_HAS_PROC_PTHREAD_SERIALIZE
     /** Value used for PTHREAD serialization */
     pthread_mutex_t *pthread_interproc;
 #endif
 #if APR_HAS_THREADS
     /* If no threads, no need for thread locks */
 #if APR_USE_PTHREAD_SERIALIZE
     /** This value is currently unused within APR and Apache */ 
     pthread_mutex_t *intraproc;
 #endif
 #endif
+#if APR_HAS_POSIXSEM_SERIALIZE
+    /** Value used for POSIX semaphores serialization */
+    sem_t *psem_interproc;
+#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 process
                                                           *   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.) */
     int protocol;           /**< 0 or actual protocol (APR_PROTO_SCTP, APR_PROTO_TCP, etc.) */
 };
 
 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 specific equivalent 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
+ * Convert the proc mutex from apr type to os specific 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);
 
 /**
+ * Convert the proc mutex from apr type to os specific type, also
+ * providing the mechanism used by the apr mutex.
+ * @param ospmutex The os specific proc mutex we are converting to.
+ * @param pmutex The apr proc mutex to convert.
+ * @param mech The mechanism used by the apr proc mutex (if not NULL).
+ * @remark Allows for disambiguation for platforms with multiple mechanisms
+ *         available.
+ */
+APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex, 
+                                                   apr_proc_mutex_t *pmutex,
+                                                   apr_lockmech_e *mech);
+
+/**
  * 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
  * @return non-zero if the two threads are equal, zero otherwise
  */ 
 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
+ * Convert a socket from the os specific type to the APR type. If
+ * sock points to NULL, a socket will be created from the pool
+ * provided. If **sock does not point to NULL, the structure pointed
+ * to by sock will be reused and updated with the given socket.
  * @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); 
 
 /**
+ * Convert the proc mutex from os specific type to apr type, using the
+ * specified mechanism.
+ * @param pmutex The apr proc mutex we are converting to.
+ * @param ospmutex The os specific proc mutex to convert.
+ * @param mech The apr mutex locking mechanism
+ * @param register_cleanup Whether to destroy the os mutex with the apr
+ *        one (either on explicit destroy or pool cleanup).
+ * @param cont The pool to use if it is needed.
+ * @remark Allows for disambiguation for platforms with multiple mechanisms
+ *         available.
+ */
+APR_DECLARE(apr_status_t) apr_os_proc_mutex_put_ex(apr_proc_mutex_t **pmutex,
+                                                apr_os_proc_mutex_t *ospmutex,
+                                                apr_lockmech_e mech,
+                                                int register_cleanup,
+                                                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) Portability 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);
 
 /** @} */
 #endif /* APR_HAS_DSO */
 
 
 #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
 
 
 /**
  * Get the name of the system default character 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
+ * @remark Defers to apr_os_default_encoding() if the current locale's
  * data can't be retrieved on this system.
  */
 APR_DECLARE(const char*) apr_os_locale_encoding(apr_pool_t *pool);
 
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  /* ! APR_PORTABLE_H */
Index: head/contrib/apr/include/apr_proc_mutex.h
===================================================================
--- head/contrib/apr/include/apr_proc_mutex.h	(revision 361677)
+++ head/contrib/apr/include/apr_proc_mutex.h	(revision 361678)
@@ -1,166 +1,192 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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"
+#include "apr_perms_set.h"
+#include "apr_time.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_LOCK_DEFAULT,       /**< Use the default process lock */
+    APR_LOCK_DEFAULT_TIMED  /**< Use the default process timed 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);
 
 /**
+ * Attempt to acquire the lock for the given mutex until timeout expires.
+ * If the acquisition time outs, the call returns with APR_TIMEUP.
+ * @param mutex the mutex on which to attempt the lock acquiring.
+ * @param timeout the relative timeout (microseconds).
+ * @note A negative or nul timeout means immediate attempt, returning
+ *       APR_TIMEUP without blocking if it the lock is already acquired.
+ */
+APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_proc_mutex_t *mutex,
+                                               apr_interval_time_t timeout);
+
+/**
  * 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
+ * Get the mechanism of the mutex, as it relates to the actual method
+ * used for the underlying apr_proc_mutex_t.
+ * @param mutex the mutex to get the mechanism from.
  */
+APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex);
+
+/**
+ * Get the mechanism's name of the mutex, as it relates to the actual method
+ * used for the underlying apr_proc_mutex_t.
+ * @param mutex the mutex to get the mechanism's name from.
+ */
 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);
+
+/**
+ * Set mutex permissions.
+ */
+APR_PERMS_SET_IMPLEMENT(proc_mutex);
 
 /**
  * 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 */
Index: head/contrib/apr/include/apr_shm.h
===================================================================
--- head/contrib/apr/include/apr_shm.h	(revision 361677)
+++ head/contrib/apr/include/apr_shm.h	(revision 361678)
@@ -1,208 +1,229 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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"
+#include "apr_perms_set.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 accessible a shared memory segment with default
  * properties.
  * @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);
 
 /**
  * Special processing flags for apr_shm_create_ex() and apr_shm_attach_ex().
  */
 #define APR_SHM_NS_LOCAL    1 /* Create or attach to named shared memory
                                * segment in the "Local" namespace on
                                * Windows.  (Ignored on other platforms.)
                                * By default, the "Global" namespace is
                                * used for privileged processes and the
                                * "Local" namespace is used otherwise.
                                */
 #define APR_SHM_NS_GLOBAL   2 /* Create or attach to named shared memory
                                * segment in the "Global" namespace on
                                * Windows.  (Ignored on other platforms.)
                                */
 
 /**
  * Create and make accessible a shared memory segment with platform-
  * specific processing.
  * @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.
  * @param flags mask of APR_SHM_* (defined above)
  * @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_ex(apr_shm_t **m,
                                             apr_size_t reqsize,
                                             const char *filename,
                                             apr_pool_t *pool,
                                             apr_int32_t flags);
 
 /**
  * Remove named resource associated with a shared memory segment,
  * preventing attachments to the resource, but not destroying it.
  * @param filename The filename associated with shared-memory segment which
  *        needs to be removed
  * @param pool The pool used for file operations
  * @remark This function is only supported on platforms which support
  * name-based shared memory segments, and will return APR_ENOTIMPL on
  * platforms without such support.  Removing the file while the shm
  * is in use is not entirely portable, caller may use this to enhance
  * obscurity of the resource, but be prepared for the call to fail,
  * and for concurrent attempts to create a resource of the same name
  * to also fail.  The pool cleanup of apr_shm_create (apr_shm_destroy)
  * also removes the named resource.
  */
 APR_DECLARE(apr_status_t) apr_shm_remove(const char *filename,
                                          apr_pool_t *pool);
 
 /**
+ * Delete named resource associated with a shared memory segment,
+ * preventing attachments to the resource.
+ * @param m The shared memory segment structure to delete.
+ * @remark This function is only supported on platforms which support
+ * name-based shared memory segments, and will return APR_ENOTIMPL on
+ * platforms without such support.  Removing the file while the shm
+ * is in use is not entirely portable, caller may use this to enhance
+ * obscurity of the resource, but be prepared for the call to fail,
+ * and for concurrent attempts to create a resource of the same name
+ * to also fail.  The pool cleanup of apr_shm_create (apr_shm_destroy)
+ * also removes the named resource.
+ */
+APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m);
+
+/**
  * 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);
 
 /**
  * Attach to a shared memory segment that was created
  * by another process, with platform-specific processing.
  * @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.
  * @param flags mask of APR_SHM_* (defined above)
  */
 APR_DECLARE(apr_status_t) apr_shm_attach_ex(apr_shm_t **m,
                                             const char *filename,
                                             apr_pool_t *pool,
                                             apr_int32_t flags);
 
 /**
  * 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.
  * @return address, aligned by APR_ALIGN_DEFAULT.
  */
 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);
+
+/**
+ * Set shared memory permissions.
+ */
+APR_PERMS_SET_IMPLEMENT(shm);
 
 /**
  * Get the pool used by this shared memory segment.
  */
 APR_POOL_DECLARE_ACCESSOR(shm);
 
 /** @} */ 
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  /* APR_SHM_T */
Index: head/contrib/apr/include/apr_skiplist.h
===================================================================
--- head/contrib/apr/include/apr_skiplist.h	(revision 361677)
+++ head/contrib/apr/include/apr_skiplist.h	(revision 361678)
@@ -1,263 +1,381 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_SKIPLIST_H
 #define APR_SKIPLIST_H
 /**
  * @file apr_skiplist.h
  * @brief APR skip list implementation
  */
 
 #include "apr.h"
 #include "apr_portable.h"
 #include <stdlib.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 /**
  * @defgroup apr_skiplist Skip list implementation
  * Refer to http://en.wikipedia.org/wiki/Skip_list for information
  * about the purpose of and ideas behind skip lists.
  * @ingroup APR
  * @{
  */
 
 /**
  * apr_skiplist_compare is the function type that must be implemented 
  * per object type that is used in a skip list for comparisons to maintain
- * order. A value <0 indicates placement after this node; a value of 0
- * indicates collision with this exact node; a value >0 indicates placement
- * before this node.
+ * order
  * */
 typedef int (*apr_skiplist_compare) (void *, void *);
 
 /**
  * apr_skiplist_freefunc is the function type that must be implemented
  * to handle elements as they are removed from a skip list.
  */
 typedef void (*apr_skiplist_freefunc) (void *);
 
 /** Opaque structure used to represent the skip list */
 struct apr_skiplist;
 /** Opaque structure used to represent the skip list */
 typedef struct apr_skiplist apr_skiplist;
 
 /** 
  * Opaque structure used to represent abstract nodes in the skip list
  * (an abstraction above the raw elements which are collected in the
  * skip list).
  */
 struct apr_skiplistnode;
 /** Opaque structure */
 typedef struct apr_skiplistnode apr_skiplistnode;
 
 /**
  * Allocate memory using the same mechanism as the skip list.
  * @param sl The skip list
  * @param size The amount to allocate
  * @remark If a pool was provided to apr_skiplist_init(), memory will
  * be allocated from the pool or from a free list maintained with
  * the skip list.  Otherwise, memory will be allocated using the
  * C standard library heap functions.
  */
 APR_DECLARE(void *) apr_skiplist_alloc(apr_skiplist *sl, size_t size);
 
 /**
  * Free memory using the same mechanism as the skip list.
  * @param sl The skip list
  * @param mem The object to free
  * @remark If a pool was provided to apr_skiplist_init(), memory will
  * be added to a free list maintained with the skip list and be available
  * to operations on the skip list or to other calls to apr_skiplist_alloc().
  * Otherwise, memory will be freed using the  C standard library heap
  * functions.
  */
 APR_DECLARE(void) apr_skiplist_free(apr_skiplist *sl, void *mem);
 
 /**
  * Allocate a new skip list
  * @param sl The pointer in which to return the newly created skip list
  * @param p The pool from which to allocate the skip list (optional).
  * @remark Unlike most APR functions, a pool is optional.  If no pool
  * is provided, the C standard library heap functions will be used instead.
  */
 APR_DECLARE(apr_status_t) apr_skiplist_init(apr_skiplist **sl, apr_pool_t *p);
 
 /**
  * Set the comparison functions to be used for searching the skip list.
  * @param sl The skip list
  * @param XXX1 FIXME
  * @param XXX2 FIXME
  *
  * @remark If existing comparison functions are being replaced, the index
  * will be replaced during this call.  That is a potentially expensive
  * operation.
  */
 APR_DECLARE(void) apr_skiplist_set_compare(apr_skiplist *sl, apr_skiplist_compare XXX1,
                              apr_skiplist_compare XXX2);
 
 /**
  * Set the indexing functions to the specified comparison functions and
  * rebuild the index.
  * @param sl The skip list
  * @param XXX1 FIXME
  * @param XXX2 FIXME
  *
  * @remark If an index already exists, it will not be replaced and the
  * comparison functions will not be changed.
  */
 APR_DECLARE(void) apr_skiplist_add_index(apr_skiplist *sl, apr_skiplist_compare XXX1,
                         apr_skiplist_compare XXX2);
 
 /**
  * Return the list maintained by the skip list abstraction.
  * @param sl The skip list
  */
 APR_DECLARE(apr_skiplistnode *) apr_skiplist_getlist(apr_skiplist *sl);
 
 /**
  * Return the next matching element in the skip list using the specified
  * comparison function.
  * @param sl The skip list
  * @param data The value to search for
  * @param iter A pointer to the returned skip list node representing the element
  * found
  * @param func The comparison function to use
  */
 APR_DECLARE(void *) apr_skiplist_find_compare(apr_skiplist *sl,
                                void *data,
                                apr_skiplistnode **iter,
                                apr_skiplist_compare func);
 
 /**
  * Return the next matching element in the skip list using the current comparison
  * function.
  * @param sl The skip list
  * @param data The value to search for
  * @param iter A pointer to the returned skip list node representing the element
  * found
  */
 APR_DECLARE(void *) apr_skiplist_find(apr_skiplist *sl, void *data, apr_skiplistnode **iter);
 
 /**
+ * Return the last matching element in the skip list using the specified
+ * comparison function.
+ * @param sl The skip list
+ * @param data The value to search for
+ * @param iter A pointer to the returned skip list node representing the element
+ * found
+ * @param comp The comparison function to use
+ */
+APR_DECLARE(void *) apr_skiplist_last_compare(apr_skiplist *sl, void *data,
+                                              apr_skiplistnode **iter,
+                                              apr_skiplist_compare comp);
+
+/**
+ * Return the last matching element in the skip list using the current comparison
+ * function.
+ * @param sl The skip list
+ * @param data The value to search for
+ * @param iter A pointer to the returned skip list node representing the element
+ * found
+ */
+APR_DECLARE(void *) apr_skiplist_last(apr_skiplist *sl, void *data,
+                                      apr_skiplistnode **iter);
+
+/**
  * Return the next element in the skip list.
  * @param sl The skip list
  * @param iter On entry, a pointer to the skip list node to start with; on return,
  * a pointer to the skip list node representing the element returned
  * @remark If iter points to a NULL value on entry, NULL will be returned.
  */
 APR_DECLARE(void *) apr_skiplist_next(apr_skiplist *sl, apr_skiplistnode **iter);
 
 /**
  * Return the previous element in the skip list.
  * @param sl The skip list
  * @param iter On entry, a pointer to the skip list node to start with; on return,
  * a pointer to the skip list node representing the element returned
  * @remark If iter points to a NULL value on entry, NULL will be returned.
  */
 APR_DECLARE(void *) apr_skiplist_previous(apr_skiplist *sl, apr_skiplistnode **iter);
 
 /**
+ * Return the element of the skip list node
+ * @param iter The skip list node
+ */
+APR_DECLARE(void *) apr_skiplist_element(apr_skiplistnode *iter);
+
+/**
  * Insert an element into the skip list using the specified comparison function
  * if it does not already exist.
  * @param sl The skip list
  * @param data The element to insert
  * @param comp The comparison function to use for placement into the skip list
  */
 APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert_compare(apr_skiplist *sl,
                                           void *data, apr_skiplist_compare comp);
 
 /**
  * Insert an element into the skip list using the existing comparison function
- * if it does not already exist (as determined by the comparison function)
+ * if it does not already exist.
  * @param sl The skip list
  * @param data The element to insert
  * @remark If no comparison function has been set for the skip list, the element
  * will not be inserted and NULL will be returned.
  */
 APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert(apr_skiplist* sl, void *data);
 
 /**
+ * Add an element into the skip list using the specified comparison function
+ * allowing for duplicates.
+ * @param sl The skip list
+ * @param data The element to add
+ * @param comp The comparison function to use for placement into the skip list
+ */
+APR_DECLARE(apr_skiplistnode *) apr_skiplist_add_compare(apr_skiplist *sl,
+                                          void *data, apr_skiplist_compare comp);
+
+/**
+ * Add an element into the skip list using the existing comparison function
+ * allowing for duplicates.
+ * @param sl The skip list
+ * @param data The element to insert
+ * @remark If no comparison function has been set for the skip list, the element
+ * will not be inserted and NULL will be returned.
+ */
+APR_DECLARE(apr_skiplistnode *) apr_skiplist_add(apr_skiplist* sl, void *data);
+
+/**
+ * Add an element into the skip list using the specified comparison function
+ * removing the existing duplicates.
+ * @param sl The skip list
+ * @param data The element to insert
+ * @param comp The comparison function to use for placement into the skip list
+ * @param myfree A function to be called for each removed duplicate
+ * @remark If no comparison function has been set for the skip list, the element
+ * will not be inserted, none will be replaced, and NULL will be returned.
+ */
+APR_DECLARE(apr_skiplistnode *) apr_skiplist_replace_compare(apr_skiplist *sl,
+                                    void *data, apr_skiplist_freefunc myfree,
+                                    apr_skiplist_compare comp);
+
+/**
+ * Add an element into the skip list using the existing comparison function
+ * removing the existing duplicates.
+ * @param sl The skip list
+ * @param data The element to insert
+ * @param myfree A function to be called for each removed duplicate
+ * @remark If no comparison function has been set for the skip list, the element
+ * will not be inserted, none will be replaced, and NULL will be returned.
+ */
+APR_DECLARE(apr_skiplistnode *) apr_skiplist_replace(apr_skiplist *sl,
+                                    void *data, apr_skiplist_freefunc myfree);
+
+/**
+ * Remove a node from the skip list.
+ * @param sl The skip list
+ * @param iter The skip list node to remove
+ * @param myfree A function to be called for the removed element
+ */
+APR_DECLARE(int) apr_skiplist_remove_node(apr_skiplist *sl,
+                                          apr_skiplistnode *iter,
+                                          apr_skiplist_freefunc myfree);
+
+/**
  * Remove an element from the skip list using the specified comparison function for
  * locating the element. In the case of duplicates, the 1st entry will be removed.
  * @param sl The skip list
  * @param data The element to remove
  * @param myfree A function to be called for each removed element
  * @param comp The comparison function to use for placement into the skip list
  * @remark If the element is not found, 0 will be returned.  Otherwise, the heightXXX
  * will be returned.
  */
 APR_DECLARE(int) apr_skiplist_remove_compare(apr_skiplist *sl, void *data,
                                apr_skiplist_freefunc myfree, apr_skiplist_compare comp);
 
 /**
  * Remove an element from the skip list using the existing comparison function for
  * locating the element. In the case of duplicates, the 1st entry will be removed.
  * @param sl The skip list
  * @param data The element to remove
  * @param myfree A function to be called for each removed element
  * @remark If the element is not found, 0 will be returned.  Otherwise, the heightXXX
  * will be returned.
  * @remark If no comparison function has been set for the skip list, the element
  * will not be removed and 0 will be returned.
  */
 APR_DECLARE(int) apr_skiplist_remove(apr_skiplist *sl, void *data, apr_skiplist_freefunc myfree);
 
 /**
  * Remove all elements from the skip list.
  * @param sl The skip list
  * @param myfree A function to be called for each removed element
  */
 APR_DECLARE(void) apr_skiplist_remove_all(apr_skiplist *sl, apr_skiplist_freefunc myfree);
 
 /**
  * Remove each element from the skip list.
  * @param sl The skip list
  * @param myfree A function to be called for each removed element
  */
 APR_DECLARE(void) apr_skiplist_destroy(apr_skiplist *sl, apr_skiplist_freefunc myfree);
 
 /**
  * Return the first element in the skip list, removing the element from the skip list.
  * @param sl The skip list
  * @param myfree A function to be called for the removed element
  * @remark NULL will be returned if there are no elements
  */
 APR_DECLARE(void *) apr_skiplist_pop(apr_skiplist *sl, apr_skiplist_freefunc myfree);
 
 /**
  * Return the first element in the skip list, leaving the element in the skip list.
  * @param sl The skip list
  * @remark NULL will be returned if there are no elements
  */
 APR_DECLARE(void *) apr_skiplist_peek(apr_skiplist *sl);
+
+/**
+ * Return the size of the list (number of elements), in O(1).
+ * @param sl The skip list
+ */
+APR_DECLARE(size_t) apr_skiplist_size(const apr_skiplist *sl);
+
+/**
+ * Return the height of the list (number of skip paths), in O(1).
+ * @param sl The skip list
+ */
+APR_DECLARE(int) apr_skiplist_height(const apr_skiplist *sl);
+
+/**
+ * Return the predefined maximum height of the skip list.
+ * @param sl The skip list
+ */
+APR_DECLARE(int) apr_skiplist_preheight(const apr_skiplist *sl);
+
+/**
+ * Set a predefined maximum height for the skip list.
+ * @param sl The skip list
+ * @param to The preheight to set, or a nul/negative value to disable.
+ * @remark When a preheight is used, the height of each inserted element is
+ * computed randomly up to this preheight instead of the current skip list's
+ * height plus one used by the default implementation. Using a preheight can
+ * probably ensure more fairness with long living elements (since with an
+ * adaptative height, former elements may have been created with a low height,
+ * hence a longest path to reach them while the skip list grows). On the other
+ * hand, the default behaviour (preheight <= 0) with a growing and decreasing
+ * maximum height is more adaptative/suitable for short living values.
+ * @note Should be called before any insertion/add.
+ */
+APR_DECLARE(void) apr_skiplist_set_preheight(apr_skiplist *sl, int to);
 
 /**
  * Merge two skip lists.  XXX SEMANTICS
  * @param sl1 One of two skip lists to be merged
  * @param sl2 The other of two skip lists to be merged
  */
 APR_DECLARE(apr_skiplist *) apr_skiplist_merge(apr_skiplist *sl1, apr_skiplist *sl2);
 
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* ! APR_SKIPLIST_H */
Index: head/contrib/apr/include/apr_strings.h
===================================================================
--- head/contrib/apr/include/apr_strings.h	(revision 361677)
+++ head/contrib/apr/include/apr_strings.h	(revision 361678)
@@ -1,380 +1,380 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 or NULL if s == NULL
  */
 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 or NULL if s == NULL
- * @remark This is a faster alternative to apr_pstrndup, for use
+ * @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.
+ *         fewer characters, use apr_pstrndup().
  */
 APR_DECLARE(char *) apr_pstrmemdup(apr_pool_t *p, const char *s, apr_size_t n)
 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
     __attribute__((alloc_size(3)))
 #endif
     ;
 
 /**
  * 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 or NULL if s == NULL
  * @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 or NULL if m == NULL
  */
 APR_DECLARE(void *) apr_pmemdup(apr_pool_t *p, const void *m, apr_size_t n)
 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
     __attribute__((alloc_size(3)))
 #endif
     ;
 
 /**
  * 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, ...)
 #if defined(__GNUC__) && __GNUC__ >= 4
     __attribute__((sentinel))
 #endif
     ;
 
 /**
  * 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 up to dst_size characters from src to dst; does not copy
  * past a NUL terminator in src, but always terminates dst with a NUL
  * regardless.
  * @param dst The destination string
  * @param src The source string
  * @param dst_size The space available in dst; dst always receives
  *                 NUL termination, so if src is longer than
  *                 dst_size, the actual number of characters copied is
  *                 dst_size - 1.
  * @return Pointer to the NUL terminator of the destination string, dst
  * @remark
  * <PRE>
  * Note the differences between this function and strncpy():
  *  1) strncpy() doesn't always NUL terminate; apr_cpystrn() does.
  *  2) strncpy() pads the destination string with NULs, which is often 
  *     unnecessary; apr_cpystrn() does not.
  *  3) strncpy() returns a pointer to the beginning of the dst string;
  *     apr_cpystrn() returns a pointer to the NUL terminator of dst, 
  *     to allow a check for truncation.
  * </PRE>
  */
 APR_DECLARE(char *) apr_cpystrn(char *dst, const char *src,
                                 apr_size_t dst_size);
 
 /**
  * Remove all whitespace 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.
  * @return A pointer to the destination string's null terminator.
  */
 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 State saved by apr_strtok() between calls.
  * @return The next token from the string
  * @note the 'last' state points to the trailing NUL char of the final
  * token, otherwise it points to the character following the current
  * token (all successive or empty occurances of sep are skiped on the
  * subsequent call to apr_strtok).  Therefore it is possible to avoid
  * a strlen() determination, with the following logic;
  * toklen = last - retval; if (*last) --toklen;
  */
 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);
 
 /**
  * Convert a numeric string into an apr_off_t numeric value.
  * @param offset The value of the parsed string.
  * @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 NULL, 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.
  * @bug *end breaks type safety; where *buf is const, *end needs to be
  * declared as const in APR 2.0
  */
 APR_DECLARE(apr_status_t) apr_strtoff(apr_off_t *offset, const char *buf, 
                                       char **end, int base);
 
 /**
  * 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 NULL, 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.  On overflow, errno is set
  * to ERANGE.  On success, errno is set to 0.
  */
 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.  On overflow, errno is set
  * to ERANGE.  On success, errno is set to 0.
  */
 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 */
Index: head/contrib/apr/include/apr_tables.h
===================================================================
--- head/contrib/apr/include/apr_tables.h	(revision 361677)
+++ head/contrib/apr/include/apr_tables.h	(revision 361678)
@@ -1,499 +1,507 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 
  * Arrays are used to store data which is referenced sequentially or
  * as a stack.  Functions are provided to push and pop individual
  * elements as well as to operate on the entire array.
  *
  * Tables are used to store data which can be referenced by key.
  * Limited capabilities are provided for tables with multiple elements
  * which share a key; while key lookup will return only a single
  * element, iteration is available.  Additionally, a table can be
  * compressed to resolve duplicates.
  *
  * Both arrays and tables may store string or binary data; some features,
  * such as concatenation or merging of elements, work only for string
  * data.
  * @{
  */
 
 /** 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 (either NULL or having no elements).
  * @param t The table to check
  * @return True if empty, False otherwise
  */
 APR_DECLARE(int) apr_is_empty_table(const apr_table_t *t);
 
 /**
  * Determine if the array is empty (either NULL or having no elements).
  * @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 (as a first-in, last-out stack).
  * @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);
 
 /** A helper macro for accessing a member of an APR array.
  *
  * @param ary the array
  * @param i the index into the array to return
  * @param type the type of the objects stored in the array
  *
  * @return the item at index i
  */
 #define APR_ARRAY_IDX(ary,i,type) (((type *)(ary)->elts)[i])
 
 /** A helper macro for pushing elements into an APR array.
  *
  * @param ary the array
  * @param type the type of the objects stored in the array
  *
  * @return the location where the new object should be placed
  */
 #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
 
 /**
  * Remove an element from an array (as a first-in, last-out stack).
  * @param arr The array to remove an element from.
  * @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);
 
 /**
  * Remove all elements from an array.
  * @param arr The array to remove all elements from.
  * @remark As the underlying storage is allocated from a pool, no
  * memory is freed by this operation, but is available for reuse.
  */
 APR_DECLARE(void) apr_array_clear(apr_array_header_t *arr);
 
 /**
  * Concatenate two arrays together.
  * @param dst The destination array, and the one to go first in the combined 
  *            array
  * @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 
+ * @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.
+ * @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);
 
 /**
  * Generate 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
  * @warning The table keys and respective values are not copied
  */
 APR_DECLARE(apr_table_t *) apr_table_copy(apr_pool_t *p,
                                           const apr_table_t *t);
 
 /**
  * Create a new table whose contents are deep copied from the given
  * table. A deep copy operation copies all fields, and makes copies
  * of dynamically allocated memory pointed to by the fields.
  * @param p The pool to allocate the new table out of
  * @param t The table to clone
  * @return A deep copy of the table passed in
  */
 APR_DECLARE(apr_table_t *) apr_table_clone(apr_pool_t *p,
                                            const apr_table_t *t);
 
 /**
  * Delete all of the elements from a table.
  * @param t The table to clear
  */
 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 (case does not matter)
  * @return The value associated with the key, or NULL if the key does not exist. 
  */
 APR_DECLARE(const char *) apr_table_get(const apr_table_t *t, const char *key);
 
 /**
  * Get values associated with a given key from the table.      If more than one
  * value exists, return a comma separated list of values.  After this call, the
  * data is still in the table.
  * @param p The pool to allocate the combined value from, if necessary
  * @param t The table to search for the key
  * @param key The key to search for (case does not matter)
  * @return The value associated with the key, or NULL if the key does not exist.
  */
 APR_DECLARE(const char *) apr_table_getm(apr_pool_t *p, 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 overwrite the old data.
  * @param t The table to add the data to.
  * @param key The key to use (case does not matter)
  * @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 overwrite the old data.
  * @param t The table to add the data to.
  * @param key The key to use (case does not matter)
  * @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 (case does not matter)
  */
 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. The merging is done by concatenating the two values, separated
  * by the string ", ".
  * @param t The table to search for the data
  * @param key The key to merge data for (case does not matter)
  * @param val The data to add
- * @remark If the key is not found, then this function acts like apr_table_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. The merging is done by concatenating the two values, separated
  * by the string ", ".
  * @param t The table to search for the data
  * @param key The key to merge data for (case does not matter)
  * @param val The data to add
- * @remark If the key is not found, then this function acts like apr_table_addn
+ * @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.
+ * @see apr_table_do @see apr_table_vdo
  */
 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.  The varargs array must be a list of zero or
  * more (char *) keys followed by a NULL pointer.  If zero keys are
  * given, the @param comp function will be invoked for every element
  * in the table.  Otherwise, the function is invoked only for those
  * elements matching the keys specified.
  *
- * If an invocation of the @param comp function returns zero,
+ * If an invocation of the comp function returns zero,
  * iteration will continue using the next specified key, if any.
  *
  * @param comp The function to run
  * @param rec The data to pass as the first argument to the function
  * @param t The table to iterate over
  * @param ... A varargs array of zero or more (char *) keys followed by NULL
  * @return FALSE if one of the comp() iterations returned zero; TRUE if all
  *            iterations returned non-zero
- * @see apr_table_do_callback_fn_t
+ * @see apr_table_do_callback_fn_t @see apr_table_vdo
  */
 APR_DECLARE_NONSTD(int) apr_table_do(apr_table_do_callback_fn_t *comp,
                                      void *rec, const apr_table_t *t, ...)
 #if defined(__GNUC__) && __GNUC__ >= 4
     __attribute__((sentinel))
 #endif
     ;
 
 /** 
  * Iterate over a table running the provided function once for every
- * element in the table.  The @param vp varargs parameter must be a
+ * element in the table.  The vp varargs parameter must be a
  * list of zero or more (char *) keys followed by a NULL pointer.  If
  * zero keys are given, the @param comp function will be invoked for
  * every element in the table.  Otherwise, the function is invoked
  * only for those elements matching the keys specified.
  *
- * If an invocation of the @param comp function returns zero,
+ * If an invocation of the comp function returns zero,
  * iteration will continue using the next specified key, if any.
  *
  * @param comp The function to run
  * @param rec The data to pass as the first argument to the function
  * @param t The table to iterate over
  * @param vp List of zero or more (char *) keys followed by NULL
  * @return FALSE if one of the comp() iterations returned zero; TRUE if all
  *            iterations returned non-zero
- * @see apr_table_do_callback_fn_t
+ * @see apr_table_do_callback_fn_t @see apr_table_do
  */
 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)
+/** flag for overlap to use apr_table_addn */
+#define APR_OVERLAP_TABLES_ADD   (2)
 /**
  * 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
+ *          APR_OVERLAP_TABLES_ADD        Use apr_table_addn
  * @remark  When merging duplicates, the two values are concatenated,
  *          separated by the string ", ".
  * @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.
  */
 /**
  * Conceptually, apr_table_overlap does this:
  *
  * <pre>
  *  apr_array_header_t *barr = apr_table_elts(b);
  *  apr_table_entry_t *belt = (apr_table_entry_t *)barr->elts;
  *  int i;
  *
  *  for (i = 0; i < barr->nelts; ++i) {
  *      if (flags & APR_OVERLAP_TABLES_MERGE) {
  *          apr_table_mergen(a, belt[i].key, belt[i].val);
  *      }
+ *      else if (flags & APR_OVERLAP_TABLES_ADD) {
+ *          apr_table_addn(a, belt[i].key, belt[i].val);
+ *      }
  *      else {
  *          apr_table_setn(a, belt[i].key, belt[i].val);
  *      }
  *  }
  * </pre>
  *
  *  Except that it is more efficient (less space and cpu-time) especially
  *  when b has many elements.
  *
  *  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.
  */
 
 APR_DECLARE(void) apr_table_overlap(apr_table_t *a, const apr_table_t *b,
                                      unsigned flags);
 
 /**
  * Eliminate redundant 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_OVERLAP_TABLES_SET to overwrite, or
+ *              APR_OVERLAP_TABLES_ADD to add
  * @remark When merging duplicates, the two values are concatenated,
  *         separated by the string ", ".
  */
 APR_DECLARE(void) apr_table_compress(apr_table_t *t, unsigned flags);
 
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif	/* ! APR_TABLES_H */
Index: head/contrib/apr/include/apr_thread_mutex.h
===================================================================
--- head/contrib/apr/include/apr_thread_mutex.h	(revision 361677)
+++ head/contrib/apr/include/apr_thread_mutex.h	(revision 361678)
@@ -1,110 +1,123 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 */
+#define APR_THREAD_MUTEX_TIMED    0x4   /**< enable timed locks */
 
 /* Delayed the include to avoid a circular reference */
 #include "apr_pools.h"
+#include "apr_time.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 optimal mutex based on a given platform's performance characteristics,
  * 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);
+
+/**
+ * Attempt to acquire the lock for the given mutex until timeout expires.
+ * If the acquisition time outs, the call returns with APR_TIMEUP.
+ * @param mutex the mutex on which to attempt the lock acquiring.
+ * @param timeout the relative timeout (microseconds).
+ * @note A timeout negative or nul means immediate attempt, returning
+ *       APR_TIMEUP without blocking if it the lock is already acquired.
+ */
+APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex,
+                                                 apr_interval_time_t timeout);
 
 /**
  * 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 */
Index: head/contrib/apr/include/apr_thread_proc.h
===================================================================
--- head/contrib/apr/include/apr_thread_proc.h	(revision 361677)
+++ head/contrib/apr/include/apr_thread_proc.h	(revision 361678)
@@ -1,826 +1,846 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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"
+#include "apr_perms_set.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 and apr_file_pipe_create_ex */
 #define APR_FULL_BLOCK       1
 /** @see apr_procattr_io_set and apr_file_pipe_create_ex */
 #define APR_FULL_NONBLOCK    2
 /** @see apr_procattr_io_set */
 #define APR_PARENT_BLOCK     3
 /** @see apr_procattr_io_set */
 #define APR_CHILD_BLOCK      4
 /** @see apr_procattr_io_set */
 #define APR_NO_FILE          8
 
 /** @see apr_file_pipe_create_ex */
 #define APR_READ_BLOCK       3
 /** @see apr_file_pipe_create_ex */
 #define APR_WRITE_BLOCK      4
 
 /** @see apr_procattr_io_set 
  * @note Win32 only effective with version 1.2.12, portably introduced in 1.3.0
  */
 #define APR_NO_FILE          8
 
 /** @see apr_procattr_limit_set */
 #define APR_LIMIT_CPU        0
 /** @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 occurring, 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 occurring, 
                                            * 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 killed (i.e., never sent
                                  * any signals), but it will be reaped if it exits
                                  * before the pool is cleaned up */
     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 Non-zero if detached threads should be created.
  */
 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
  * @return APR_DETACH if threads are to be detached, or APR_NOTDETACH
  * if threads are to be joinable. 
  */
 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);
 
 /**
  * Set the stack guard area size of newly created threads.
  * @param attr The threadattr to affect 
  * @param guardsize The stack guard area size in bytes
  * @note Thread library implementations commonly use a "guard area"
  * after each thread's stack which is not readable or writable such that
  * stack overflows cause a segfault; this consumes e.g. 4K of memory
  * and increases memory management overhead.  Setting the guard area
  * size to zero hence trades off reliable behaviour on stack overflow
  * for performance. */
 APR_DECLARE(apr_status_t) apr_threadattr_guardsize_set(apr_threadattr_t *attr,
                                                        apr_size_t guardsize);
 
 /**
  * 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 user data 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);
 
 /**
  * Set user data 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?
  * @note If APR_NO_PIPE, there will be no special channel, the child
  * inherits the parent's corresponding stdio stream.  If APR_NO_FILE is 
  * specified, that corresponding stream is closed in the child (and will
  * be INVALID_HANDLE_VALUE when inspected on Win32). This can have ugly 
  * side effects, as the next file opened in the child on Unix will fall
  * into the stdio stream fd slot!
  */
 APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, 
                                              apr_int32_t in, apr_int32_t out,
                                              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.
  * @bug Note that calling this function with two NULL files on some platforms
  * creates an APR_FULL_BLOCK pipe, but this behavior is neither portable nor
  * is it supported.  @see apr_procattr_io_set instead for simple pipes.
  */
 APR_DECLARE(apr_status_t) apr_procattr_child_in_set(struct apr_procattr_t *attr,
                                                   apr_file_t *child_in,
                                                   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. 
  * @bug Note that calling this function with two NULL files on some platforms
  * creates an APR_FULL_BLOCK pipe, but this behavior is neither portable nor
  * is it supported.  @see apr_procattr_io_set instead for simple pipes.
  */
 APR_DECLARE(apr_status_t) apr_procattr_child_out_set(struct apr_procattr_t *attr,
                                                    apr_file_t *child_out,
                                                    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. 
  * @bug Note that calling this function with two NULL files on some platforms
  * creates an APR_FULL_BLOCK pipe, but this behavior is neither portable nor
  * is it supported.  @see apr_procattr_io_set instead for simple pipes.
  */
 APR_DECLARE(apr_status_t) apr_procattr_child_err_set(struct apr_procattr_t *attr,
                                                    apr_file_t *child_err,
                                                    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);
 
 /**
  * Set the username used for running process
  * @param attr The procattr we care about. 
  * @param username The username used
  * @param password User password if needed. Password is needed on WIN32
  *                 or any other platform having
  *                 APR_PROCATTR_USER_SET_REQUIRES_PASSWORD set.
  */
 APR_DECLARE(apr_status_t) apr_procattr_user_set(apr_procattr_t *attr,
                                                 const char *username,
                                                 const char *password);
 
 /**
  * Set the group used for running process
  * @param attr The procattr we care about. 
  * @param groupname The group name  used
  */
 APR_DECLARE(apr_status_t) apr_procattr_group_set(apr_procattr_t *attr,
                                                  const char *groupname);
 
 
+/**
+ * Register permission set function
+ * @param attr The procattr we care about. 
+ * @param perms_set_fn Permission set callback
+ * @param data Data to pass to permission callback function
+ * @param perms Permissions to set
+ */
+APR_DECLARE(apr_status_t) apr_procattr_perms_set_register(apr_procattr_t *attr,
+                                                 apr_perms_setfn_t *perms_set_fn,
+                                                 void *data,
+                                                 apr_fileperms_t perms);
+
 #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. 
  * @remark returns APR_INCHILD for the child, and APR_INPARENT for the parent
  * or an error.
  */
 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 pool The pool to use.
  * @note This function returns without waiting for the new process to terminate;
  * use apr_proc_wait for that.
  */
 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 *pool);
 
 /**
  * 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 child's 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);
 
 /** 
  * 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))
+ * @note Synchronous signals like SIGABRT/SIGSEGV/SIGBUS/... are ignored by
+ * apr_signal_thread() and thus can't be waited by this function (they remain
+ * handled by the operating system or its native signals interface).
+ * @remark In APR version 1.6 and ealier, SIGUSR2 was part of these ignored
+ * signals and thus was never passed in to the signal_handler. From APR 1.7
+ * this is no more the case so SIGUSR2 can be handled in signal_handler and
+ * acted upon like the other asynchronous signals.
  */
 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 */
 
Index: head/contrib/apr/include/apr_time.h
===================================================================
--- head/contrib/apr/include/apr_time.h	(revision 361677)
+++ head/contrib/apr/include/apr_time.h	(revision 361678)
@@ -1,235 +1,237 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 milliseconds as an apr_time_t */
 #define apr_time_from_msec(msec) ((apr_time_t)(msec) * 1000)
 
 /** @return seconds 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 January 1 */
     apr_int32_t tm_yday;
     /** daylight saving time */
     apr_int32_t tm_isdst;
     /** seconds east of UTC */
     apr_int32_t tm_gmtoff;
 };
+
+/* Delayed the include to avoid a circular reference */
+#include "apr_pools.h"
 
 /**
  * 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);
 
 /**
  * Convert a time to its human readable components (GMT).
  * @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 the 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);
 
 /**
  * Convert time value from human readable format to a numeric apr_time_t
  * (elapsed microseconds since the 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);
 
 /**
  * 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 APR_RFC822_DATA_LEN bytes of storage,
  * including the trailing NUL terminator.
  * @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 APR_CTIME_LEN bytes of storage including
  * the trailing NUL terminator.
  * 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 desirable 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 */
Index: head/contrib/apr/include/apr_version.h
===================================================================
--- head/contrib/apr/include/apr_version.h	(revision 361677)
+++ head/contrib/apr/include/apr_version.h	(revision 361678)
@@ -1,164 +1,164 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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
 
 /**
  * @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
  */
 
 
-#define APR_COPYRIGHT "Copyright (c) 2000-2015 The Apache Software " \
+#define APR_COPYRIGHT "Copyright (c) 2000-2019 The Apache Software " \
                       "Foundation or its licensors, as applicable."
 
 /* 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       1
 
 /** minor version
  * Minor API changes that do not cause binary compatibility problems.
  * Reset to 0 when upgrading APR_MAJOR_VERSION
  */
-#define APR_MINOR_VERSION       5
+#define APR_MINOR_VERSION       7
 
 /** patch level 
  * The Patch Level never includes API changes, simply bug fixes.
  * Reset to 0 when upgrading APR_MINOR_VERSION
  */
-#define APR_PATCH_VERSION       2
+#define APR_PATCH_VERSION       0
 
 /** 
  * The symbol APR_IS_DEV_VERSION is only defined for internal,
  * "development" copies of APR.  It is undefined for released versions
  * of APR.
  */
-/* #define APR_IS_DEV_VERSION */
+/* #undef APR_IS_DEV_VERSION */
 
 /**
  * Check at compile time if the APR version is at least a certain
  * level.
  * @param major The major version component of the version checked
  * for (e.g., the "1" of "1.3.0").
  * @param minor The minor version component of the version checked
  * for (e.g., the "3" of "1.3.0").
  * @param patch The patch level component of the version checked
  * for (e.g., the "0" of "1.3.0").
  * @remark This macro is available with APR versions starting with
  * 1.3.0.
  */
 #define APR_VERSION_AT_LEAST(major,minor,patch)                    \
 (((major) < APR_MAJOR_VERSION)                                     \
  || ((major) == APR_MAJOR_VERSION && (minor) < APR_MINOR_VERSION) \
  || ((major) == APR_MAJOR_VERSION && (minor) == APR_MINOR_VERSION && (patch) <= APR_PATCH_VERSION))
 
 #if defined(APR_IS_DEV_VERSION) || defined(DOXYGEN)
 /** Internal: string form of the "is dev" flag */
 #ifndef APR_IS_DEV_STRING
 #define APR_IS_DEV_STRING "-dev"
 #endif
 #else
 #define APR_IS_DEV_STRING ""
 #endif
 
 /* APR_STRINGIFY is defined here, and also in apr_general.h, so wrap it */
 #ifndef APR_STRINGIFY
 /** 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
 #endif
 
 /** 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
 
 /** 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
 
 
 #ifndef APR_VERSION_ONLY
 
 /* The C language API to access the version at run time, 
  * as opposed to compile time.  APR_VERSION_ONLY may be defined 
  * externally when preprocessing apr_version.h to obtain strictly 
  * the C Preprocessor macro declarations.
  */
 
 #include "apr.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /** 
  * 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);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* ndef APR_VERSION_ONLY */
 
 #endif /* ndef APR_VERSION_H */
Index: head/contrib/apr/include/arch/unix/apr_arch_atomic.h
===================================================================
--- head/contrib/apr/include/arch/unix/apr_arch_atomic.h	(revision 361677)
+++ head/contrib/apr/include/arch/unix/apr_arch_atomic.h	(revision 361678)
@@ -1,45 +1,53 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #ifndef ATOMIC_H
 #define ATOMIC_H
 
 #include "apr.h"
+#include "apr_pools.h"
 #include "apr_private.h"
 #include "apr_atomic.h"
-#include "apr_thread_mutex.h"
 
 #if defined(USE_ATOMICS_GENERIC)
 /* noop */
-#elif defined(__GNUC__) && defined(__STRICT_ANSI__)
-/* force use of generic atomics if building e.g. with -std=c89, which
- * doesn't allow inline asm */
-#   define USE_ATOMICS_GENERIC
 #elif HAVE_ATOMIC_BUILTINS
 #   define USE_ATOMICS_BUILTINS
 #elif defined(SOLARIS2) && SOLARIS2 >= 10
 #   define USE_ATOMICS_SOLARIS
+#   define NEED_ATOMICS_GENERIC64
+#elif defined(__GNUC__) && defined(__STRICT_ANSI__)
+/* force use of generic atomics if building e.g. with -std=c89, which
+ * doesn't allow inline asm */
+#   define USE_ATOMICS_GENERIC
 #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
 #   define USE_ATOMICS_IA32
+#   define NEED_ATOMICS_GENERIC64
 #elif defined(__GNUC__) && (defined(__PPC__) || defined(__ppc__))
 #   define USE_ATOMICS_PPC
+#   define NEED_ATOMICS_GENERIC64
 #elif defined(__GNUC__) && (defined(__s390__) || defined(__s390x__))
 #   define USE_ATOMICS_S390
+#   define NEED_ATOMICS_GENERIC64
 #else
 #   define USE_ATOMICS_GENERIC
+#endif
+
+#if defined(USE_ATOMICS_GENERIC) || defined (NEED_ATOMICS_GENERIC64)
+apr_status_t apr__atomic_generic64_init(apr_pool_t *p);
 #endif
 
 #endif /* ATOMIC_H */
Index: head/contrib/apr/include/arch/unix/apr_arch_networkio.h
===================================================================
--- head/contrib/apr/include/arch/unix/apr_arch_networkio.h	(revision 361677)
+++ head/contrib/apr/include/arch/unix/apr_arch_networkio.h	(revision 361678)
@@ -1,142 +1,145 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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"
 #ifndef WAITIO_USES_POLL
 #include "apr_poll.h"
 #endif
 
 /* 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 *pool;
     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
+#if APR_HAVE_SOCKADDR_UN
+    int bound;
+#endif
     int local_port_unknown;
     int local_interface_unknown;
     int remote_addr_unknown;
     apr_int32_t options;
     apr_int32_t inherit;
     sock_userdata_t *userdata;
 #ifndef WAITIO_USES_POLL
     /* if there is a timeout set, then this pollset is used */
     apr_pollset_t *pollset;
 #endif
 };
 
 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(skt, option)  \
     (((skt)->options & (option)) == (option))
 
 #define apr_set_option(skt, option, on) \
     do {                                 \
         if (on)                          \
             (skt)->options |= (option);         \
         else                             \
             (skt)->options &= ~(option);        \
     } while (0)
 
 #endif  /* ! NETWORK_IO_H */
 
Index: head/contrib/apr/include/arch/unix/apr_arch_poll_private.h
===================================================================
--- head/contrib/apr/include/arch/unix/apr_arch_poll_private.h	(revision 361677)
+++ head/contrib/apr/include/arch/unix/apr_arch_poll_private.h	(revision 361678)
@@ -1,178 +1,189 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_ARCH_POLL_PRIVATE_H
 #define APR_ARCH_POLL_PRIVATE_H
 
 #if HAVE_POLL_H
 #include <poll.h>
 #endif
 
 #if HAVE_SYS_POLL_H
 #include <sys/poll.h>
 #endif
 
 #ifdef HAVE_PORT_CREATE
 #include <port.h>
 #include <sys/port_impl.h>
 #endif
 
 #ifdef HAVE_KQUEUE
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #endif
 
 #ifdef HAVE_EPOLL
 #include <sys/epoll.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
 
 #if defined(HAVE_AIO_H) && defined(HAVE_AIO_MSGQ)
 #define _AIO_OS390	/* enable a bunch of z/OS aio.h definitions */
 #include <aio.h>	/* aiocb	*/
 #endif
 
 /* Choose the best method platform specific to use in apr_pollset */
 #ifdef HAVE_KQUEUE
 #define POLLSET_USES_KQUEUE
 #define POLLSET_DEFAULT_METHOD APR_POLLSET_KQUEUE
 #elif defined(HAVE_PORT_CREATE)
 #define POLLSET_USES_PORT
 #define POLLSET_DEFAULT_METHOD APR_POLLSET_PORT
 #elif defined(HAVE_EPOLL)
 #define POLLSET_USES_EPOLL
 #define POLLSET_DEFAULT_METHOD APR_POLLSET_EPOLL
 #elif defined(HAVE_AIO_MSGQ)
 #define POLLSET_USES_AIO_MSGQ
 #define POLLSET_DEFAULT_METHOD APR_POLLSET_AIO_MSGQ
 #elif defined(HAVE_POLL)
 #define POLLSET_USES_POLL
 #define POLLSET_DEFAULT_METHOD APR_POLLSET_POLL
 #else
 #define POLLSET_USES_SELECT
 #define POLLSET_DEFAULT_METHOD APR_POLLSET_SELECT
 #endif
 
 #ifdef WIN32
 #define POLL_USES_SELECT
 #undef POLLSET_DEFAULT_METHOD
 #define POLLSET_DEFAULT_METHOD APR_POLLSET_SELECT
 #else
 #ifdef HAVE_POLL
 #define POLL_USES_POLL
 #else
 #define POLL_USES_SELECT
 #endif
 #endif
 
 #if defined(POLLSET_USES_KQUEUE) || defined(POLLSET_USES_EPOLL) || defined(POLLSET_USES_PORT) || defined(POLLSET_USES_AIO_MSGQ)
 
 #include "apr_ring.h"
 
 #if APR_HAS_THREADS
 #include "apr_thread_mutex.h"
 #define pollset_lock_rings() \
     if (pollset->flags & APR_POLLSET_THREADSAFE) \
         apr_thread_mutex_lock(pollset->p->ring_lock);
 #define pollset_unlock_rings() \
     if (pollset->flags & APR_POLLSET_THREADSAFE) \
         apr_thread_mutex_unlock(pollset->p->ring_lock);
 #else
 #define pollset_lock_rings()
 #define pollset_unlock_rings()
 #endif
 
 typedef struct pfd_elem_t pfd_elem_t;
 
 struct pfd_elem_t {
     APR_RING_ENTRY(pfd_elem_t) link;
     apr_pollfd_t pfd;
 #ifdef HAVE_PORT_CREATE
    int on_query_ring;
 #endif
 };
 
 #endif
 
 typedef struct apr_pollset_private_t apr_pollset_private_t;
 typedef struct apr_pollset_provider_t apr_pollset_provider_t;
 typedef struct apr_pollcb_provider_t apr_pollcb_provider_t;
 
 struct apr_pollset_t
 {
     apr_pool_t *pool;
     apr_uint32_t nelts;
     apr_uint32_t nalloc;
     apr_uint32_t flags;
     /* Pipe descriptors used for wakeup */
     apr_file_t *wakeup_pipe[2];
     apr_pollfd_t wakeup_pfd;
     apr_pollset_private_t *p;
-    apr_pollset_provider_t *provider;
+    const apr_pollset_provider_t *provider;
 };
 
 typedef union {
 #if defined(HAVE_EPOLL)
     struct epoll_event *epoll;
 #endif
 #if defined(HAVE_PORT_CREATE)
     port_event_t *port;
 #endif
 #if defined(HAVE_KQUEUE)
     struct kevent *ke;
 #endif
 #if defined(HAVE_POLL)
     struct pollfd *ps;
 #endif
     void *undef;
 } apr_pollcb_pset;
 
 struct apr_pollcb_t {
     apr_pool_t *pool;
     apr_uint32_t nelts;
     apr_uint32_t nalloc;
+    apr_uint32_t flags;
+    /* Pipe descriptors used for wakeup */
+    apr_file_t *wakeup_pipe[2];
+    apr_pollfd_t wakeup_pfd;
     int fd;
     apr_pollcb_pset pollset;
     apr_pollfd_t **copyset;
-    apr_pollcb_provider_t *provider;
+    const apr_pollcb_provider_t *provider;
 };
 
 struct apr_pollset_provider_t {
     apr_status_t (*create)(apr_pollset_t *, apr_uint32_t, apr_pool_t *, apr_uint32_t);
     apr_status_t (*add)(apr_pollset_t *, const apr_pollfd_t *);
     apr_status_t (*remove)(apr_pollset_t *, const apr_pollfd_t *);
     apr_status_t (*poll)(apr_pollset_t *, apr_interval_time_t, apr_int32_t *, const apr_pollfd_t **);
     apr_status_t (*cleanup)(apr_pollset_t *);
     const char *name;
 };
 
 struct apr_pollcb_provider_t {
     apr_status_t (*create)(apr_pollcb_t *, apr_uint32_t, apr_pool_t *, apr_uint32_t);
     apr_status_t (*add)(apr_pollcb_t *, apr_pollfd_t *);
     apr_status_t (*remove)(apr_pollcb_t *, apr_pollfd_t *);
     apr_status_t (*poll)(apr_pollcb_t *, apr_interval_time_t, apr_pollcb_cb_t, void *);
+    apr_status_t (*cleanup)(apr_pollcb_t *);
     const char *name;
 };
 
-/* Private functions */
-void apr_pollset_drain_wakeup_pipe(apr_pollset_t *pollset);
+/* 
+ * Private functions used for the implementation of both apr_pollcb_* and 
+ * apr_pollset_*
+ */
+apr_status_t apr_poll_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd, 
+                                         apr_file_t **wakeup_pipe);
+apr_status_t apr_poll_close_wakeup_pipe(apr_file_t **wakeup_pipe);
+void apr_poll_drain_wakeup_pipe(apr_file_t **wakeup_pipe);
 
 #endif /* APR_ARCH_POLL_PRIVATE_H */
Index: head/contrib/apr/include/arch/unix/apr_arch_proc_mutex.h
===================================================================
--- head/contrib/apr/include/arch/unix/apr_arch_proc_mutex.h	(revision 361677)
+++ head/contrib/apr/include/arch/unix/apr_arch_proc_mutex.h	(revision 361678)
@@ -1,113 +1,121 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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"
+#include "apr_time.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 (*timedacquire)(apr_proc_mutex_t *, apr_interval_time_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 *);
+    apr_status_t (*perms_set)(apr_proc_mutex_t *, apr_fileperms_t, apr_uid_t, apr_gid_t);
+    apr_lockmech_e mech;
     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_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;
+
+    apr_os_proc_mutex_t os;     /* Native mutex holder. */
+
+#if APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE
+    apr_file_t *interproc;      /* For apr_file_ calls on native fd. */
+    int interproc_closing;      /* whether the native fd is opened/closed with
+                                 * 'interproc' or apr_os_file_put()ed (hence
+                                 * needing an an explicit close for consistency
+                                 * with other methods).
+                                 */
 #endif
-#if APR_HAS_POSIXSEM_SERIALIZE
-    sem_t *psem_interproc;
-#endif
 #if APR_HAS_PROC_PTHREAD_SERIALIZE
-    pthread_mutex_t *pthread_interproc;
+    int pthread_refcounting;    /* Whether the native mutex is refcounted or
+                                 * apr_os_proc_mutex_put()ed, which makes
+                                 * refcounting impossible/undesirable.
+                                 */
 #endif
 };
 
 void apr_proc_mutex_unix_setup_lock(void);
 
 #endif  /* PROC_MUTEX_H */
 
Index: head/contrib/apr/include/arch/unix/apr_arch_shm.h
===================================================================
--- head/contrib/apr/include/arch/unix/apr_arch_shm.h	(revision 361677)
+++ head/contrib/apr/include/arch/unix/apr_arch_shm.h	(revision 361678)
@@ -1,73 +1,74 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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"
 
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #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() */
+    key_t shmkey;       /* shmem key IPC_ANON or returned from ftok() */
 #endif
 };
 
 #endif /* SHM_H */
Index: head/contrib/apr/include/arch/unix/apr_arch_thread_mutex.h
===================================================================
--- head/contrib/apr/include/arch/unix/apr_arch_thread_mutex.h	(revision 361677)
+++ head/contrib/apr/include/arch/unix/apr_arch_thread_mutex.h	(revision 361678)
@@ -1,39 +1,42 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_thread_cond.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;
+    apr_thread_cond_t *cond;
+    int locked, num_waiters;
 };
 #endif
 
 #endif  /* THREAD_MUTEX_H */
 
Index: head/contrib/apr/include/arch/unix/apr_arch_threadproc.h
===================================================================
--- head/contrib/apr/include/arch/unix/apr_arch_threadproc.h	(revision 361677)
+++ head/contrib/apr/include/arch/unix/apr_arch_threadproc.h	(revision 361678)
@@ -1,109 +1,119 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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"
+#include "apr_perms_set.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
 #ifdef HAVE_SCHED_H
 #include <sched.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
 
+typedef struct apr_procattr_pscb_t apr_procattr_pscb_t;
+struct apr_procattr_pscb_t {
+    struct apr_procattr_pscb_t *next;
+    apr_perms_setfn_t *perms_set_fn;
+    apr_fileperms_t perms;
+    const void *data;
+};
+
 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;
     apr_uid_t   uid;
     apr_gid_t   gid;
+    apr_procattr_pscb_t *perms_set_callbacks;
 };
 
 #endif  /* ! THREAD_PROC_H */
 
Index: head/contrib/apr/include/arch/unix/apr_private.h.in
===================================================================
--- head/contrib/apr/include/arch/unix/apr_private.h.in	(revision 361677)
+++ head/contrib/apr/include/arch/unix/apr_private.h.in	(revision 361678)
@@ -1,1000 +1,1075 @@
 /* include/arch/unix/apr_private.h.in.  Generated from configure.in by autoheader.  */
 
 
 #ifndef APR_PRIVATE_H
 #define APR_PRIVATE_H
 
 
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
+/* Define if apr_allocator should use guard pages */
+#undef APR_ALLOCATOR_GUARD_PAGES
+
 /* Define if apr_allocator should use mmap */
 #undef APR_ALLOCATOR_USES_MMAP
 
 /* Define as function which can be used for conversion of strings to
    apr_int64_t */
 #undef APR_INT64_STRFN
 
 /* Define as function used for conversion of strings to apr_off_t */
 #undef APR_OFF_T_STRFN
 
+/* Define if pool functions should abort if concurrent usage is detected */
+#undef APR_POOL_CONCURRENCY_CHECK
+
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
 #undef CRAY_STACKSEG_END
 
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
 /* Define to path of random device */
 #undef DEV_RANDOM
 
 /* Define if struct dirent has an inode member */
 #undef DIRENT_INODE
 
 /* Define if struct dirent has a d_type member */
 #undef DIRENT_TYPE
 
 /* 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 fcntl returns EACCES when F_SETLK is already held */
 #undef FCNTL_TRYACQUIRE_EACCES
 
 /* 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 if getservbyname is thread safe */
 #undef GETSERVBYNAME_IS_THREAD_SAFE
 
 /* Define if getservbyname_r has the glibc style */
 #undef GETSERVBYNAME_R_GLIBC2
 
 /* Define if getservbyname_r has the OSF/1 style */
 #undef GETSERVBYNAME_R_OSF1
 
 /* Define if getservbyname_r has the Solaris style */
 #undef GETSERVBYNAME_R_SOLARIS
 
 /* Define if accept4 function is supported */
 #undef HAVE_ACCEPT4
 
+/* Define to 1 if you have the `acquire_sem' function. */
+#undef HAVE_ACQUIRE_SEM
+
+/* Define to 1 if you have the `acquire_sem_etc' function. */
+#undef HAVE_ACQUIRE_SEM_ETC
+
 /* Define if async i/o supports message q's */
 #undef HAVE_AIO_MSGQ
 
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
 /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
    */
 #undef HAVE_ALLOCA_H
 
+/* Define to 1 if you have the `arc4random_buf' function. */
+#undef HAVE_ARC4RANDOM_BUF
+
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
 
 /* Define if compiler provides atomic builtins */
 #undef HAVE_ATOMIC_BUILTINS
 
 /* Define if BONE_VERSION is defined in sys/socket.h */
 #undef HAVE_BONE_VERSION
 
 /* 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 `create_sem' function. */
 #undef HAVE_CREATE_SEM
 
 /* Define to 1 if you have the <crypt.h> header file. */
 #undef HAVE_CRYPT_H
 
 /* 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_getrandom', and to 0 if you
+   don't. */
+#undef HAVE_DECL_SYS_GETRANDOM
+
 /* 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 <dl.h> header file. */
 #undef HAVE_DL_H
 
 /* Define if dup3 function is supported */
 #undef HAVE_DUP3
 
 /* Define if EGD is supported */
 #undef HAVE_EGD
 
 /* Define if the epoll interface is supported */
 #undef HAVE_EPOLL
 
 /* Define if epoll_create1 function is supported */
 #undef HAVE_EPOLL_CREATE1
 
 /* 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 `fdatasync' function. */
 #undef HAVE_FDATASYNC
 
 /* 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 F_SETLK is defined in fcntl.h */
 #undef HAVE_F_SETLK
 
 /* Define if getaddrinfo accepts the AI_ADDRCONFIG flag */
 #undef HAVE_GAI_ADDRCONFIG
 
 /* 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 to 1 if you have the `getifaddrs' function. */
 #undef HAVE_GETIFADDRS
 
 /* 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 `getrandom' function. */
+#undef HAVE_GETRANDOM
+
 /* Define to 1 if you have the `getrlimit' function. */
 #undef HAVE_GETRLIMIT
 
 /* Define to 1 if you have the `getservbyname_r' function. */
 #undef HAVE_GETSERVBYNAME_R
 
 /* Define to 1 if you have the `gmtime_r' function. */
 #undef HAVE_GMTIME_R
 
 /* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H
 
 /* Define if hstrerror is present */
 #undef HAVE_HSTRERROR
 
+/* Define to 1 if you have the `if_indextoname' function. */
+#undef HAVE_IF_INDEXTONAME
+
+/* Define to 1 if you have the `if_nametoindex' function. */
+#undef HAVE_IF_NAMETOINDEX
+
 /* 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 `kqueue' function. */
 #undef HAVE_KQUEUE
 
 /* 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 `sendfile' library (-lsendfile). */
 #undef HAVE_LIBSENDFILE
 
 /* 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 <linux/random.h> header file. */
+#undef HAVE_LINUX_RANDOM_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 <memcheck.h> header file. */
+#undef HAVE_MEMCHECK_H
+
 /* 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 `mkstemp64' function. */
 #undef HAVE_MKSTEMP64
 
 /* Define to 1 if you have the `mmap' function. */
 #undef HAVE_MMAP
 
 /* Define to 1 if you have the `mmap64' function. */
 #undef HAVE_MMAP64
 
+/* Define to 1 if you have the `mprotect' function. */
+#undef HAVE_MPROTECT
+
 /* 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 <net/if.h> header file. */
+#undef HAVE_NET_IF_H
+
 /* Define to 1 if you have the `nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
 /* 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 <OS.h> header file. */
 #undef HAVE_OS_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 `port_create' function. */
 #undef HAVE_PORT_CREATE
 
 /* Define to 1 if you have the <process.h> header file. */
 #undef HAVE_PROCESS_H
 
 /* Define to 1 if you have the `pthread_attr_setguardsize' function. */
 #undef HAVE_PTHREAD_ATTR_SETGUARDSIZE
 
+/* Define to 1 if you have the `pthread_condattr_setpshared' function. */
+#undef HAVE_PTHREAD_CONDATTR_SETPSHARED
+
 /* 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 non-posix/portable cross-process robust mutexes are available */
+#undef HAVE_PTHREAD_MUTEX_ROBUST_NP
+
+/* Define to 1 if you have the `pthread_mutex_timedlock' function. */
+#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+
 /* 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 `pthread_yield' function. */
 #undef HAVE_PTHREAD_YIELD
 
 /* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
 /* Define to 1 if you have the <pwd.h> header file. */
 #undef HAVE_PWD_H
 
 /* Define to 1 if you have the `readdir64_r' function. */
 #undef HAVE_READDIR64_R
 
 /* Define to 1 if you have the <sched.h> header file. */
 #undef HAVE_SCHED_H
 
 /* Define to 1 if you have the `sched_yield' function. */
 #undef HAVE_SCHED_YIELD
 
 /* Define to 1 if you have the <semaphore.h> header file. */
 #undef HAVE_SEMAPHORE_H
 
 /* 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 `semop' function. */
+#undef HAVE_SEMOP
+
+/* Define to 1 if you have the `semtimedop' function. */
+#undef HAVE_SEMTIMEDOP
+
 /* 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 to 1 if you have the `sem_timedwait' function. */
+#undef HAVE_SEM_TIMEDWAIT
+
 /* 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 `sendfile64' function. */
 #undef HAVE_SENDFILE64
 
 /* Define to 1 if you have the `sendfilev' function. */
 #undef HAVE_SENDFILEV
 
 /* Define to 1 if you have the `sendfilev64' function. */
 #undef HAVE_SENDFILEV64
 
 /* 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 the SOCK_CLOEXEC flag is supported */
 #undef HAVE_SOCK_CLOEXEC
 
 /* 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 if struct impreq was found */
 #undef HAVE_STRUCT_IPMREQ
 
 /* Define to 1 if `st_atimensec' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIMENSEC
 
 /* Define to 1 if `st_atime_n' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIME_N
 
 /* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
 
 /* Define to 1 if `st_blocks' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 
 /* Define to 1 if `st_ctimensec' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_CTIMENSEC
 
 /* Define to 1 if `st_ctime_n' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_CTIME_N
 
 /* Define to 1 if `st_ctim.tv_nsec' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC
 
 /* Define to 1 if `st_mtimensec' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_MTIMENSEC
 
 /* Define to 1 if `st_mtime_n' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_MTIME_N
 
 /* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
 
 /* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_GMTOFF
 
 /* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM___TM_GMTOFF
 
 /* 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/param.h> header file. */
 #undef HAVE_SYS_PARAM_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/random.h> header file. */
+#undef HAVE_SYS_RANDOM_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/syscall.h> header file. */
+#undef HAVE_SYS_SYSCALL_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/uuid.h> header file. */
 #undef HAVE_SYS_UUID_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_NODELAY and TCP_CORK can be enabled at the same time */
 #undef HAVE_TCP_NODELAY_WITH_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 to 1 if you have the `uuid_create' function. */
 #undef HAVE_UUID_CREATE
 
 /* Define to 1 if you have the `uuid_generate' function. */
 #undef HAVE_UUID_GENERATE
 
 /* Define to 1 if you have the <uuid.h> header file. */
 #undef HAVE_UUID_H
 
 /* Define to 1 if you have the <uuid/uuid.h> header file. */
 #undef HAVE_UUID_UUID_H
 
+/* Compile in valgrind support */
+#undef HAVE_VALGRIND
+
+/* Define to 1 if you have the <valgrind.h> header file. */
+#undef HAVE_VALGRIND_H
+
 /* 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 <windows.h> header file. */
 #undef HAVE_WINDOWS_H
 
 /* Define to 1 if you have the <winsock2.h> header file. */
 #undef HAVE_WINSOCK2_H
 
 /* Define to 1 if you have the `writev' function. */
 #undef HAVE_WRITEV
 
 /* Define for z/OS pthread API nuances */
 #undef HAVE_ZOS_PTHREADS
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* 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 home page for this package. */
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
 /* Define if POSIX semaphores affect threads within the process */
 #undef POSIXSEM_IS_GLOBAL
 
 /* Define on PowerPC 405 where errata 77 applies */
 #undef PPC405_ERRATA
 
 /* Define if pthread_attr_getdetachstate() has one arg */
 #undef PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG
 
 /* Define if pthread_getspecific() has two args */
 #undef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS
 
-/* Define if readdir is thread safe */
+/* Modern readdir is thread safe */
 #undef READDIR_IS_THREAD_SAFE
 
 /* 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 ino_t */
 #undef SIZEOF_INO_T
 
 /* 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 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 struct iovec */
 #undef SIZEOF_STRUCT_IOVEC
 
 /* The size of `void*', as computed by sizeof. */
 #undef SIZEOF_VOIDP
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Define if strerror returns int */
 #undef STRERROR_R_RC_INT
 
 /* Define if SysV semaphores affect threads within the process */
 #undef SYSVSEM_IS_GLOBAL
 
+/* Define system call of random */
+#undef SYS_RANDOM
+
 /* Define if use of generic atomics is requested */
 #undef USE_ATOMICS_GENERIC
 
 /* Define if BeOS Semaphores will be used */
 #undef USE_BEOSSEM
 
 /* Define if SVR4-style fcntl() will be used */
 #undef USE_FCNTL_SERIALIZE
 
 /* Define if 4.2BSD-style flock() will be used */
 #undef USE_FLOCK_SERIALIZE
+
+/* Define if pthread pshared mutex will be used */
+#undef USE_PROC_PTHREAD_SERIALIZE
 
 /* Define if BeOS areas will be used */
 #undef USE_SHMEM_BEOS
 
 /* Define if BeOS areas will be used */
 #undef USE_SHMEM_BEOS_ANON
 
 /* Define if 4.4BSD-style mmap() via MAP_ANON will be used */
 #undef USE_SHMEM_MMAP_ANON
 
 /* Define if mmap() via POSIX.1 shm_open() on temporary file will be used */
 #undef USE_SHMEM_MMAP_SHM
 
 /* Define if Classical mmap() on temporary file will be used */
 #undef USE_SHMEM_MMAP_TMP
 
 /* Define if SVR4-style mmap() on /dev/zero will be used */
 #undef USE_SHMEM_MMAP_ZERO
 
 /* Define if OS/2 DosAllocSharedMem() will be used */
 #undef USE_SHMEM_OS2
 
 /* Define if OS/2 DosAllocSharedMem() will be used */
 #undef USE_SHMEM_OS2_ANON
 
 /* Define if SysV IPC shmget() will be used */
 #undef USE_SHMEM_SHMGET
 
 /* Define if SysV IPC shmget() will be used */
 #undef USE_SHMEM_SHMGET_ANON
 
 /* Define if Windows shared memory will be used */
 #undef USE_SHMEM_WIN32
 
 /* Define if Windows CreateFileMapping() will be used */
 #undef USE_SHMEM_WIN32_ANON
 
 /* 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 SysV IPC semget() will be used */
 #undef USE_SYSVSEM_SERIALIZE
 
 /* Define if apr_wait_for_io_or_timeout() uses poll(2) */
 #undef WAITIO_USES_POLL
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
 # if defined __BIG_ENDIAN__
 #  define WORDS_BIGENDIAN 1
 # endif
 #else
 # ifndef WORDS_BIGENDIAN
 #  undef WORDS_BIGENDIAN
 # endif
 #endif
 
 /* 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
 
 
 /* switch this on if we have a BeOS version below BONE */
 #if defined(BEOS) && !defined(HAVE_BONE_VERSION)
 #define BEOS_R5 1
 #else
 #define BEOS_BONE 1
 #endif
 
 /*
  * Darwin 10's default compiler (gcc42) builds for both 64 and
  * 32 bit architectures unless specifically told not to.
  * In those cases, we need to override types depending on how
  * we're being built at compile time.
  * NOTE: This is an ugly work-around for Darwin's
  * concept of universal binaries, a single package
  * (executable, lib, etc...) which contains both 32
  * and 64 bit versions. The issue is that if APR is
  * built universally, if something else is compiled
  * against it, some bit sizes will depend on whether
  * it is 32 or 64 bit. This is determined by the __LP64__
  * flag. Since we need to support both, we have to
  * handle OS X unqiuely.
  */
 #ifdef DARWIN_10
 
 #undef APR_OFF_T_STRFN
 #undef APR_INT64_STRFN
 #undef SIZEOF_LONG
 #undef SIZEOF_SIZE_T
 #undef SIZEOF_SSIZE_T
 #undef SIZEOF_VOIDP
 #undef SIZEOF_STRUCT_IOVEC
 
 #ifdef __LP64__
  #define APR_INT64_STRFN strtol
  #define SIZEOF_LONG    8
  #define SIZEOF_SIZE_T  8
  #define SIZEOF_SSIZE_T 8
  #define SIZEOF_VOIDP   8
  #define SIZEOF_STRUCT_IOVEC 16
 #else
  #define APR_INT64_STRFN strtoll
  #define SIZEOF_LONG    4
  #define SIZEOF_SIZE_T  4
  #define SIZEOF_SSIZE_T 4
  #define SIZEOF_VOIDP   4
  #define SIZEOF_STRUCT_IOVEC 8
 #endif
 
 #undef APR_OFF_T_STRFN
 #define APR_OFF_T_STRFN APR_INT64_STRFN
  
 
 #undef SETPGRP_VOID
 #ifdef __DARWIN_UNIX03
  #define SETPGRP_VOID 1
 #else
 /* #undef SETPGRP_VOID */
 #endif
  
 #endif /* DARWIN_10 */
 
 /*
  * Include common private declarations.
  */
 #include "../apr_private_common.h"
 #endif /* APR_PRIVATE_H */
 
Index: head/contrib/apr/include/private/apr_encode_private.h
===================================================================
--- head/contrib/apr/include/private/apr_encode_private.h	(nonexistent)
+++ head/contrib/apr/include/private/apr_encode_private.h	(revision 361678)
@@ -0,0 +1,84 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file apr_encode_private.h
+ * @brief APR-UTIL Encoding Private
+ */
+#ifndef APR_ENCODE_PRIVATE_H
+#define APR_ENCODE_PRIVATE_H
+
+#include "apr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @defgroup APR_Util_Encode_Private
+ * @ingroup APR_Util
+ * @{
+ */
+
+#if APR_CHARSET_EBCDIC
+    static int convert_a2e[256] = {
+        0x00, 0x01, 0x02, 0x03, 0x37, 0x2D, 0x2E, 0x2F, 0x16, 0x05, 0x15, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+        0x10, 0x11, 0x12, 0x13, 0x3C, 0x3D, 0x32, 0x26, 0x18, 0x19, 0x3F, 0x27, 0x1C, 0x1D, 0x1E, 0x1F,
+        0x40, 0x5A, 0x7F, 0x7B, 0x5B, 0x6C, 0x50, 0x7D, 0x4D, 0x5D, 0x5C, 0x4E, 0x6B, 0x60, 0x4B, 0x61,
+        0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0x7A, 0x5E, 0x4C, 0x7E, 0x6E, 0x6F,
+        0x7C, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6,
+        0xD7, 0xD8, 0xD9, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xAD, 0xE0, 0xBD, 0x5F, 0x6D,
+        0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+        0x97, 0x98, 0x99, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xC0, 0x4F, 0xD0, 0xA1, 0x07,
+        0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x06, 0x17, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x09, 0x0A, 0x1B,
+        0x30, 0x31, 0x1A, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3A, 0x3B, 0x04, 0x14, 0x3E, 0xFF,
+        0x41, 0xAA, 0x4A, 0xB1, 0x9F, 0xB2, 0x6A, 0xB5, 0xBB, 0xB4, 0x9A, 0x8A, 0xB0, 0xCA, 0xAF, 0xBC,
+        0x90, 0x8F, 0xEA, 0xFA, 0xBE, 0xA0, 0xB6, 0xB3, 0x9D, 0xDA, 0x9B, 0x8B, 0xB7, 0xB8, 0xB9, 0xAB,
+        0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9E, 0x68, 0x74, 0x71, 0x72, 0x73, 0x78, 0x75, 0x76, 0x77,
+        0xAC, 0x69, 0xED, 0xEE, 0xEB, 0xEF, 0xEC, 0xBF, 0x80, 0xFD, 0xFE, 0xFB, 0xFC, 0xBA, 0xAE, 0x59,
+        0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9C, 0x48, 0x54, 0x51, 0x52, 0x53, 0x58, 0x55, 0x56, 0x57,
+    0x8C, 0x49, 0xCD, 0xCE, 0xCB, 0xCF, 0xCC, 0xE1, 0x70, 0xDD, 0xDE, 0xDB, 0xDC, 0x8D, 0x8E, 0xDF};
+
+    static int convert_e2a[256] = {
+        0x00, 0x01, 0x02, 0x03, 0x9C, 0x09, 0x86, 0x7F, 0x97, 0x8D, 0x8E, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+        0x10, 0x11, 0x12, 0x13, 0x9D, 0x0A, 0x08, 0x87, 0x18, 0x19, 0x92, 0x8F, 0x1C, 0x1D, 0x1E, 0x1F,
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x17, 0x1B, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x05, 0x06, 0x07,
+        0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, 0x98, 0x99, 0x9A, 0x9B, 0x14, 0x15, 0x9E, 0x1A,
+        0x20, 0xA0, 0xE2, 0xE4, 0xE0, 0xE1, 0xE3, 0xE5, 0xE7, 0xF1, 0xA2, 0x2E, 0x3C, 0x28, 0x2B, 0x7C,
+        0x26, 0xE9, 0xEA, 0xEB, 0xE8, 0xED, 0xEE, 0xEF, 0xEC, 0xDF, 0x21, 0x24, 0x2A, 0x29, 0x3B, 0x5E,
+        0x2D, 0x2F, 0xC2, 0xC4, 0xC0, 0xC1, 0xC3, 0xC5, 0xC7, 0xD1, 0xA6, 0x2C, 0x25, 0x5F, 0x3E, 0x3F,
+        0xF8, 0xC9, 0xCA, 0xCB, 0xC8, 0xCD, 0xCE, 0xCF, 0xCC, 0x60, 0x3A, 0x23, 0x40, 0x27, 0x3D, 0x22,
+        0xD8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0xAB, 0xBB, 0xF0, 0xFD, 0xFE, 0xB1,
+        0xB0, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0xAA, 0xBA, 0xE6, 0xB8, 0xC6, 0xA4,
+        0xB5, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0xA1, 0xBF, 0xD0, 0x5B, 0xDE, 0xAE,
+        0xAC, 0xA3, 0xA5, 0xB7, 0xA9, 0xA7, 0xB6, 0xBC, 0xBD, 0xBE, 0xDD, 0xA8, 0xAF, 0x5D, 0xB4, 0xD7,
+        0x7B, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0xAD, 0xF4, 0xF6, 0xF2, 0xF3, 0xF5,
+        0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0xB9, 0xFB, 0xFC, 0xF9, 0xFA, 0xFF,
+        0x5C, 0xF7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0xB2, 0xD4, 0xD6, 0xD2, 0xD3, 0xD5,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0xB3, 0xDB, 0xDC, 0xD9, 0xDA, 0x9F};
+#define decode ENCODE_TO_ASCII(ch)  convert_e2a[(unsigned char)ch]
+#define decode ENCODE_TO_NATIVE(ch)  convert_a2e[(unsigned char)ch]
+#else                           /* APR_CHARSET_EBCDIC */
+#define ENCODE_TO_ASCII(ch)  (ch)
+#define ENCODE_TO_NATIVE(ch)  (ch)
+#endif                          /* !APR_CHARSET_EBCDIC */
+
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+
+#endif                          /* !APR_ENCODE_PRIVATE_H */

Property changes on: head/contrib/apr/include/private/apr_encode_private.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/apr/libapr.dsp
===================================================================
--- head/contrib/apr/libapr.dsp	(revision 361677)
+++ head/contrib/apr/libapr.dsp	(revision 361678)
@@ -1,962 +1,868 @@
 # 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 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 "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 Release"
 !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 "libapr - Win32 Release9x" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libapr - Win32 Debug9x" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libapr - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libapr - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "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 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\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 /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY"
 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 /out:"Release\libapr-1.dll" /pdb:"Release\libapr-1.pdb" /implib:"Release\libapr-1.lib" /MACHINE:X86 /opt:ref
 # Begin Special Build Tool
 TargetPath=Release\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "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 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY"
 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 /out:"Debug\libapr-1.dll" /pdb:"Debug\libapr-1.pdb" /implib:"Debug\libapr-1.lib" /MACHINE:X86
 # Begin Special Build Tool
 TargetPath=Debug\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
-!ELSEIF  "$(CFG)" == "libapr - Win32 Release9x"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "9x\Release"
-# PROP BASE Intermediate_Dir "9x\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "9x\Release"
-# PROP Intermediate_Dir "9x\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\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 /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY"
-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 /out:"9x\Release\libapr-1.dll" /pdb:"9x\Release\libapr-1.pdb" /implib:"9x\Release\libapr-1.lib" /MACHINE:X86 /opt:ref
-# Begin Special Build Tool
-TargetPath=9x\Release\libapr.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug9x"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "9x\Debug"
-# PROP BASE Intermediate_Dir "9x\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "9x\Debug"
-# PROP Intermediate_Dir "9x\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY"
-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 /out:"9x\Debug\libapr-1.dll" /pdb:"9x\Debug\libapr-1.pdb" /implib:"9x\Debug\libapr-1.lib" /MACHINE:X86
-# Begin Special Build Tool
-TargetPath=9x\Debug\libapr-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
-# End Special Build Tool
-
 !ELSEIF  "$(CFG)" == "libapr - x64 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "x64\Release"
 # PROP BASE Intermediate_Dir "x64\Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "x64\Release"
 # PROP Intermediate_Dir "x64\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\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 /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY"
 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 /out:"x64\Release\libapr-1.dll" /pdb:"x64\Release\libapr-1.pdb" /implib:"x64\Release\libapr-1.lib" /MACHINE:X64 /opt:ref
 # Begin Special Build Tool
 TargetPath=x64\Release\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "libapr - x64 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "x64\Debug"
 # PROP BASE Intermediate_Dir "x64\Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "x64\Debug"
 # PROP Intermediate_Dir "x64\Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY"
 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 /out:"x64\Debug\libapr-1.dll" /pdb:"x64\Debug\libapr-1.pdb" /implib:"x64\Debug\libapr-1.lib" /MACHINE:X64
 # Begin Special Build Tool
 TargetPath=x64\Debug\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
 !ENDIF 
 
 # Begin Target
 
 # Name "libapr - Win32 Release"
 # Name "libapr - Win32 Debug"
-# Name "libapr - Win32 Release9x"
-# Name "libapr - Win32 Debug9x"
 # Name "libapr - x64 Release"
 # Name "libapr - x64 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ".c"
 # Begin Group "atomic"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\atomic\win32\apr_atomic.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\atomic\win32\apr_atomic64.c
+# End Source File
 # End Group
 # Begin Group "dso"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\dso\win32\dso.c
 # End Source File
 # End Group
 # Begin Group "encoding"
 
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\encoding\apr_encode.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\encoding\apr_escape.c
 # End Source File
 # End Group
 # Begin Group "file_io"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\file_io\win32\buffer.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\file_io\unix\copy.c
 # End Source File
 # Begin Source File
 
 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=.\network_io\unix\multicast.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\unix\socket_util.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 "poll"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\poll\unix\poll.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\poll\unix\pollcb.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\poll\unix\pollset.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\poll\unix\select.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\poll\unix\wakeup.c
+# End Source File
 # End Group
 # Begin Group "random"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\random\unix\apr_random.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\random\unix\sha2.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\random\unix\sha2_glue.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_cstr.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
 # Begin Source File
 
 SOURCE=.\tables\apr_skiplist.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\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
 
-!ELSEIF  "$(CFG)" == "libapr - Win32 Release9x"
-
-# 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 Debug9x"
-
-# 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 - x64 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 - x64 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_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_escape.h
 
 !IF  "$(CFG)" == "libapr - Win32 Release"
 
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Release\gen_test_char /Fe.\Release\gen_test_char.exe .\tools\gen_test_char.c 
 	.\Release\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
 
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Debug\gen_test_char /Fe.\Debug\gen_test_char.exe .\tools\gen_test_char.c  
 	.\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Release9x"
-
-# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
-InputPath=.\include\apr_escape.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\Release\gen_test_char /Fe.\9x\Release\gen_test_char.exe .\tools\gen_test_char.c 
-	.\9x\Release\gen_test_char.exe > .\include\apr_escape_test_char.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug9x"
-
-# Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
-InputPath=.\include\apr_escape.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\Debug\gen_test_char /Fe.\9x\Debug\gen_test_char.exe .\tools\gen_test_char.c  
-	.\9x\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libapr - x64 Release"
 
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Release\gen_test_char /Fe.\x64\Release\gen_test_char.exe .\tools\gen_test_char.c 
 	.\x64\Release\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libapr - x64 Debug"
 
 # Begin Custom Build - Creating gen_test_char.exe and apr_escape_test_char.h
 InputPath=.\include\apr_escape.h
 
 ".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Debug\gen_test_char /Fe.\x64\Debug\gen_test_char.exe .\tools\gen_test_char.c 
 	.\x64\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h
 
 # End Custom Build
 
 !ENDIF 
 
 # 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_random.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_skiplist.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
Index: head/contrib/apr/libapr.mak
===================================================================
--- head/contrib/apr/libapr.mak	(revision 361677)
+++ head/contrib/apr/libapr.mak	(revision 361678)
@@ -1,2118 +1,1609 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on libapr.dsp
 !IF "$(CFG)" == ""
 CFG=libapr - Win32 Release
 !MESSAGE No configuration specified. Defaulting to libapr - Win32 Release.
 !ENDIF 
 
 !IF "$(CFG)" != "libapr - Win32 Release" && "$(CFG)" != "libapr - Win32 Debug" && "$(CFG)" != "libapr - Win32 Release9x" && "$(CFG)" != "libapr - Win32 Debug9x" && "$(CFG)" != "libapr - x64 Release" && "$(CFG)" != "libapr - x64 Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !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 Release"
 !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 "libapr - Win32 Release9x" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libapr - Win32 Debug9x" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libapr - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libapr - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
 !ELSE 
 NULL=nul
 !ENDIF 
 
 !IF  "$(CFG)" == "libapr - Win32 Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
 DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
 # Begin Custom Macros
 OutDir=.\Release
 # End Custom Macros
 
-ALL : ".\Release\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
+ALL : ".\include\apr.hw" ".\include\apr_escape.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
 
 
 CLEAN :
 	-@erase "$(INTDIR)\apr_atomic.obj"
+	-@erase "$(INTDIR)\apr_atomic64.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
+	-@erase "$(INTDIR)\apr_cpstr.obj"
+	-@erase "$(INTDIR)\apr_encode.obj"
 	-@erase "$(INTDIR)\apr_escape.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
 	-@erase "$(INTDIR)\apr_getpass.obj"
 	-@erase "$(INTDIR)\apr_hash.obj"
 	-@erase "$(INTDIR)\apr_pools.obj"
 	-@erase "$(INTDIR)\apr_random.obj"
 	-@erase "$(INTDIR)\apr_skiplist.obj"
 	-@erase "$(INTDIR)\apr_snprintf.obj"
 	-@erase "$(INTDIR)\apr_strings.obj"
 	-@erase "$(INTDIR)\apr_strnatcmp.obj"
 	-@erase "$(INTDIR)\apr_strtok.obj"
 	-@erase "$(INTDIR)\apr_tables.obj"
 	-@erase "$(INTDIR)\buffer.obj"
 	-@erase "$(INTDIR)\charset.obj"
 	-@erase "$(INTDIR)\common.obj"
 	-@erase "$(INTDIR)\copy.obj"
 	-@erase "$(INTDIR)\dir.obj"
 	-@erase "$(INTDIR)\dso.obj"
 	-@erase "$(INTDIR)\env.obj"
 	-@erase "$(INTDIR)\errorcodes.obj"
 	-@erase "$(INTDIR)\fileacc.obj"
 	-@erase "$(INTDIR)\filedup.obj"
 	-@erase "$(INTDIR)\filepath.obj"
 	-@erase "$(INTDIR)\filepath_util.obj"
 	-@erase "$(INTDIR)\filestat.obj"
 	-@erase "$(INTDIR)\filesys.obj"
 	-@erase "$(INTDIR)\flock.obj"
 	-@erase "$(INTDIR)\fullrw.obj"
 	-@erase "$(INTDIR)\getopt.obj"
 	-@erase "$(INTDIR)\groupinfo.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
 	-@erase "$(INTDIR)\inet_pton.obj"
 	-@erase "$(INTDIR)\internal.obj"
 	-@erase "$(INTDIR)\libapr.res"
 	-@erase "$(INTDIR)\libapr_src.idb"
 	-@erase "$(INTDIR)\libapr_src.pdb"
 	-@erase "$(INTDIR)\misc.obj"
 	-@erase "$(INTDIR)\mktemp.obj"
 	-@erase "$(INTDIR)\mmap.obj"
 	-@erase "$(INTDIR)\multicast.obj"
 	-@erase "$(INTDIR)\open.obj"
 	-@erase "$(INTDIR)\otherchild.obj"
 	-@erase "$(INTDIR)\pipe.obj"
 	-@erase "$(INTDIR)\poll.obj"
 	-@erase "$(INTDIR)\pollcb.obj"
 	-@erase "$(INTDIR)\pollset.obj"
 	-@erase "$(INTDIR)\proc.obj"
 	-@erase "$(INTDIR)\proc_mutex.obj"
 	-@erase "$(INTDIR)\rand.obj"
 	-@erase "$(INTDIR)\readwrite.obj"
 	-@erase "$(INTDIR)\seek.obj"
 	-@erase "$(INTDIR)\select.obj"
 	-@erase "$(INTDIR)\sendrecv.obj"
 	-@erase "$(INTDIR)\sha2.obj"
 	-@erase "$(INTDIR)\sha2_glue.obj"
 	-@erase "$(INTDIR)\shm.obj"
 	-@erase "$(INTDIR)\signals.obj"
 	-@erase "$(INTDIR)\sockaddr.obj"
 	-@erase "$(INTDIR)\socket_util.obj"
 	-@erase "$(INTDIR)\sockets.obj"
 	-@erase "$(INTDIR)\sockopt.obj"
 	-@erase "$(INTDIR)\start.obj"
 	-@erase "$(INTDIR)\tempdir.obj"
 	-@erase "$(INTDIR)\thread.obj"
 	-@erase "$(INTDIR)\thread_cond.obj"
 	-@erase "$(INTDIR)\thread_mutex.obj"
 	-@erase "$(INTDIR)\thread_rwlock.obj"
 	-@erase "$(INTDIR)\threadpriv.obj"
 	-@erase "$(INTDIR)\time.obj"
 	-@erase "$(INTDIR)\timestr.obj"
 	-@erase "$(INTDIR)\userinfo.obj"
 	-@erase "$(INTDIR)\utf8.obj"
 	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\wakeup.obj"
 	-@erase "$(OUTDIR)\libapr-1.dll"
 	-@erase "$(OUTDIR)\libapr-1.exp"
 	-@erase "$(OUTDIR)\libapr-1.lib"
 	-@erase "$(OUTDIR)\libapr-1.pdb"
 	-@erase ".\include\apr.h"
 	-@erase ".\include\apr_gen_test_char.h"
 	-@erase "$(OUTDIR)\gen_test_char.exe"
 	-@erase "$(OUTDIR)\gen_test_char.obj"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /c 
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
 RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 /opt:ref 
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib"  /opt:ref 
 LINK32_OBJS= \
 	"$(INTDIR)\apr_atomic.obj" \
+	"$(INTDIR)\apr_atomic64.obj" \
 	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\apr_encode.obj" \
 	"$(INTDIR)\apr_escape.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\copy.obj" \
 	"$(INTDIR)\dir.obj" \
 	"$(INTDIR)\fileacc.obj" \
 	"$(INTDIR)\filedup.obj" \
 	"$(INTDIR)\filepath.obj" \
 	"$(INTDIR)\filepath_util.obj" \
 	"$(INTDIR)\filestat.obj" \
 	"$(INTDIR)\filesys.obj" \
 	"$(INTDIR)\flock.obj" \
 	"$(INTDIR)\fullrw.obj" \
 	"$(INTDIR)\mktemp.obj" \
 	"$(INTDIR)\open.obj" \
 	"$(INTDIR)\pipe.obj" \
 	"$(INTDIR)\readwrite.obj" \
 	"$(INTDIR)\seek.obj" \
 	"$(INTDIR)\tempdir.obj" \
 	"$(INTDIR)\proc_mutex.obj" \
 	"$(INTDIR)\thread_cond.obj" \
 	"$(INTDIR)\thread_mutex.obj" \
 	"$(INTDIR)\thread_rwlock.obj" \
 	"$(INTDIR)\apr_pools.obj" \
 	"$(INTDIR)\charset.obj" \
 	"$(INTDIR)\env.obj" \
 	"$(INTDIR)\errorcodes.obj" \
 	"$(INTDIR)\getopt.obj" \
 	"$(INTDIR)\internal.obj" \
 	"$(INTDIR)\misc.obj" \
 	"$(INTDIR)\otherchild.obj" \
 	"$(INTDIR)\rand.obj" \
 	"$(INTDIR)\start.obj" \
 	"$(INTDIR)\utf8.obj" \
 	"$(INTDIR)\version.obj" \
 	"$(INTDIR)\common.obj" \
 	"$(INTDIR)\mmap.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
 	"$(INTDIR)\inet_pton.obj" \
 	"$(INTDIR)\multicast.obj" \
 	"$(INTDIR)\sendrecv.obj" \
 	"$(INTDIR)\sockaddr.obj" \
 	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\socket_util.obj" \
 	"$(INTDIR)\sockopt.obj" \
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\poll.obj" \
 	"$(INTDIR)\pollcb.obj" \
 	"$(INTDIR)\pollset.obj" \
 	"$(INTDIR)\select.obj" \
 	"$(INTDIR)\apr_random.obj" \
 	"$(INTDIR)\sha2.obj" \
 	"$(INTDIR)\sha2_glue.obj" \
 	"$(INTDIR)\shm.obj" \
 	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_cstr.obj" \
 	"$(INTDIR)\apr_fnmatch.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_strings.obj" \
 	"$(INTDIR)\apr_strnatcmp.obj" \
 	"$(INTDIR)\apr_strtok.obj" \
 	"$(INTDIR)\apr_hash.obj" \
 	"$(INTDIR)\apr_tables.obj" \
 	"$(INTDIR)\apr_skiplist.obj" \
 	"$(INTDIR)\proc.obj" \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
 	"$(INTDIR)\userinfo.obj" \
+	"$(INTDIR)\wakeup.obj" \
 	"$(INTDIR)\libapr.res"
 
 "$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
 TargetPath=.\Release\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
 
 # Begin Custom Macros
 OutDir=.\Release
 # End Custom Macros
 
 "$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll"
    if exist .\Release\libapr-1.dll.manifest mt.exe -manifest .\Release\libapr-1.dll.manifest -outputresource:.\Release\libapr-1.dll;2
 	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
 
 !ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
 DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
 # Begin Custom Macros
 OutDir=.\Debug
 # End Custom Macros
 
-ALL : ".\include\apr_escape_test_char.h" ".\Debug\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
+ALL : ".\include\apr.hw" ".\include\apr_escape.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
 
 
 CLEAN :
 	-@erase "$(INTDIR)\apr_atomic.obj"
+	-@erase "$(INTDIR)\apr_atomic64.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
+	-@erase "$(INTDIR)\apr_cpstr.obj"
+	-@erase "$(INTDIR)\apr_encode.obj"
 	-@erase "$(INTDIR)\apr_escape.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
 	-@erase "$(INTDIR)\apr_getpass.obj"
 	-@erase "$(INTDIR)\apr_hash.obj"
 	-@erase "$(INTDIR)\apr_pools.obj"
 	-@erase "$(INTDIR)\apr_random.obj"
 	-@erase "$(INTDIR)\apr_skiplist.obj"
 	-@erase "$(INTDIR)\apr_snprintf.obj"
 	-@erase "$(INTDIR)\apr_strings.obj"
 	-@erase "$(INTDIR)\apr_strnatcmp.obj"
 	-@erase "$(INTDIR)\apr_strtok.obj"
 	-@erase "$(INTDIR)\apr_tables.obj"
 	-@erase "$(INTDIR)\buffer.obj"
 	-@erase "$(INTDIR)\charset.obj"
 	-@erase "$(INTDIR)\common.obj"
 	-@erase "$(INTDIR)\copy.obj"
 	-@erase "$(INTDIR)\dir.obj"
 	-@erase "$(INTDIR)\dso.obj"
 	-@erase "$(INTDIR)\env.obj"
 	-@erase "$(INTDIR)\errorcodes.obj"
 	-@erase "$(INTDIR)\fileacc.obj"
 	-@erase "$(INTDIR)\filedup.obj"
 	-@erase "$(INTDIR)\filepath.obj"
 	-@erase "$(INTDIR)\filepath_util.obj"
 	-@erase "$(INTDIR)\filestat.obj"
 	-@erase "$(INTDIR)\filesys.obj"
 	-@erase "$(INTDIR)\flock.obj"
 	-@erase "$(INTDIR)\fullrw.obj"
 	-@erase "$(INTDIR)\getopt.obj"
 	-@erase "$(INTDIR)\groupinfo.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
 	-@erase "$(INTDIR)\inet_pton.obj"
 	-@erase "$(INTDIR)\internal.obj"
 	-@erase "$(INTDIR)\libapr.res"
 	-@erase "$(INTDIR)\libapr_src.idb"
 	-@erase "$(INTDIR)\libapr_src.pdb"
 	-@erase "$(INTDIR)\misc.obj"
 	-@erase "$(INTDIR)\mktemp.obj"
 	-@erase "$(INTDIR)\mmap.obj"
 	-@erase "$(INTDIR)\multicast.obj"
 	-@erase "$(INTDIR)\open.obj"
 	-@erase "$(INTDIR)\otherchild.obj"
 	-@erase "$(INTDIR)\pipe.obj"
 	-@erase "$(INTDIR)\poll.obj"
 	-@erase "$(INTDIR)\pollcb.obj"
 	-@erase "$(INTDIR)\pollset.obj"
 	-@erase "$(INTDIR)\proc.obj"
 	-@erase "$(INTDIR)\proc_mutex.obj"
 	-@erase "$(INTDIR)\rand.obj"
 	-@erase "$(INTDIR)\readwrite.obj"
 	-@erase "$(INTDIR)\seek.obj"
 	-@erase "$(INTDIR)\select.obj"
 	-@erase "$(INTDIR)\sendrecv.obj"
 	-@erase "$(INTDIR)\sha2.obj"
 	-@erase "$(INTDIR)\sha2_glue.obj"
 	-@erase "$(INTDIR)\shm.obj"
 	-@erase "$(INTDIR)\signals.obj"
 	-@erase "$(INTDIR)\sockaddr.obj"
 	-@erase "$(INTDIR)\socket_util.obj"
 	-@erase "$(INTDIR)\sockets.obj"
 	-@erase "$(INTDIR)\sockopt.obj"
 	-@erase "$(INTDIR)\start.obj"
 	-@erase "$(INTDIR)\tempdir.obj"
 	-@erase "$(INTDIR)\thread.obj"
 	-@erase "$(INTDIR)\thread_cond.obj"
 	-@erase "$(INTDIR)\thread_mutex.obj"
 	-@erase "$(INTDIR)\thread_rwlock.obj"
 	-@erase "$(INTDIR)\threadpriv.obj"
 	-@erase "$(INTDIR)\time.obj"
 	-@erase "$(INTDIR)\timestr.obj"
 	-@erase "$(INTDIR)\userinfo.obj"
 	-@erase "$(INTDIR)\utf8.obj"
 	-@erase "$(INTDIR)\version.obj"
+	-@erase "$(INTDIR)\wakeup.obj"
 	-@erase "$(OUTDIR)\libapr-1.dll"
 	-@erase "$(OUTDIR)\libapr-1.exp"
 	-@erase "$(OUTDIR)\libapr-1.lib"
 	-@erase "$(OUTDIR)\libapr-1.pdb"
 	-@erase ".\include\apr.h"
 	-@erase ".\include\apr_gen_test_char.h"
 	-@erase "$(OUTDIR)\gen_test_char.exe"
 	-@erase "$(OUTDIR)\gen_test_char.obj"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c 
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 MTL=midl.exe
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
 RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib"  
 LINK32_OBJS= \
 	"$(INTDIR)\apr_atomic.obj" \
+	"$(INTDIR)\apr_atomic64.obj" \
 	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\apr_encode.obj" \
 	"$(INTDIR)\apr_escape.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\copy.obj" \
 	"$(INTDIR)\dir.obj" \
 	"$(INTDIR)\fileacc.obj" \
 	"$(INTDIR)\filedup.obj" \
 	"$(INTDIR)\filepath.obj" \
 	"$(INTDIR)\filepath_util.obj" \
 	"$(INTDIR)\filestat.obj" \
 	"$(INTDIR)\filesys.obj" \
 	"$(INTDIR)\flock.obj" \
 	"$(INTDIR)\fullrw.obj" \
 	"$(INTDIR)\mktemp.obj" \
 	"$(INTDIR)\open.obj" \
 	"$(INTDIR)\pipe.obj" \
 	"$(INTDIR)\readwrite.obj" \
 	"$(INTDIR)\seek.obj" \
 	"$(INTDIR)\tempdir.obj" \
 	"$(INTDIR)\proc_mutex.obj" \
 	"$(INTDIR)\thread_cond.obj" \
 	"$(INTDIR)\thread_mutex.obj" \
 	"$(INTDIR)\thread_rwlock.obj" \
 	"$(INTDIR)\apr_pools.obj" \
 	"$(INTDIR)\charset.obj" \
 	"$(INTDIR)\env.obj" \
 	"$(INTDIR)\errorcodes.obj" \
 	"$(INTDIR)\getopt.obj" \
 	"$(INTDIR)\internal.obj" \
 	"$(INTDIR)\misc.obj" \
 	"$(INTDIR)\otherchild.obj" \
 	"$(INTDIR)\rand.obj" \
 	"$(INTDIR)\start.obj" \
 	"$(INTDIR)\utf8.obj" \
 	"$(INTDIR)\version.obj" \
 	"$(INTDIR)\common.obj" \
 	"$(INTDIR)\mmap.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
 	"$(INTDIR)\inet_pton.obj" \
 	"$(INTDIR)\multicast.obj" \
 	"$(INTDIR)\sendrecv.obj" \
 	"$(INTDIR)\sockaddr.obj" \
 	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\socket_util.obj" \
 	"$(INTDIR)\sockopt.obj" \
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\poll.obj" \
 	"$(INTDIR)\pollcb.obj" \
 	"$(INTDIR)\pollset.obj" \
 	"$(INTDIR)\select.obj" \
 	"$(INTDIR)\apr_random.obj" \
 	"$(INTDIR)\sha2.obj" \
 	"$(INTDIR)\sha2_glue.obj" \
 	"$(INTDIR)\shm.obj" \
 	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_cstr.obj" \
 	"$(INTDIR)\apr_fnmatch.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_strings.obj" \
 	"$(INTDIR)\apr_strnatcmp.obj" \
 	"$(INTDIR)\apr_strtok.obj" \
 	"$(INTDIR)\apr_hash.obj" \
 	"$(INTDIR)\apr_tables.obj" \
 	"$(INTDIR)\apr_skiplist.obj" \
 	"$(INTDIR)\proc.obj" \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
 	"$(INTDIR)\userinfo.obj" \
+	"$(INTDIR)\wakeup.obj" \
 	"$(INTDIR)\libapr.res"
 
 "$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
 TargetPath=.\Debug\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
 
 # Begin Custom Macros
 OutDir=.\Debug
 # End Custom Macros
 
 "$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll"
    if exist .\Debug\libapr-1.dll.manifest mt.exe -manifest .\Debug\libapr-1.dll.manifest -outputresource:.\Debug\libapr-1.dll;2
 	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
 
-!ELSEIF  "$(CFG)" == "libapr - Win32 Release9x"
-
-OUTDIR=.\9x\Release
-INTDIR=.\9x\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\9x\Release
-# End Custom Macros
-
-ALL : ".\include\apr_escape_test_char.h" ".\9x\Release\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\apr_atomic.obj"
-	-@erase "$(INTDIR)\apr_cpystrn.obj"
-	-@erase "$(INTDIR)\apr_escape.obj"
-	-@erase "$(INTDIR)\apr_fnmatch.obj"
-	-@erase "$(INTDIR)\apr_getpass.obj"
-	-@erase "$(INTDIR)\apr_hash.obj"
-	-@erase "$(INTDIR)\apr_pools.obj"
-	-@erase "$(INTDIR)\apr_random.obj"
-	-@erase "$(INTDIR)\apr_skiplist.obj"
-	-@erase "$(INTDIR)\apr_snprintf.obj"
-	-@erase "$(INTDIR)\apr_strings.obj"
-	-@erase "$(INTDIR)\apr_strnatcmp.obj"
-	-@erase "$(INTDIR)\apr_strtok.obj"
-	-@erase "$(INTDIR)\apr_tables.obj"
-	-@erase "$(INTDIR)\buffer.obj"
-	-@erase "$(INTDIR)\charset.obj"
-	-@erase "$(INTDIR)\common.obj"
-	-@erase "$(INTDIR)\copy.obj"
-	-@erase "$(INTDIR)\dir.obj"
-	-@erase "$(INTDIR)\dso.obj"
-	-@erase "$(INTDIR)\env.obj"
-	-@erase "$(INTDIR)\errorcodes.obj"
-	-@erase "$(INTDIR)\fileacc.obj"
-	-@erase "$(INTDIR)\filedup.obj"
-	-@erase "$(INTDIR)\filepath.obj"
-	-@erase "$(INTDIR)\filepath_util.obj"
-	-@erase "$(INTDIR)\filestat.obj"
-	-@erase "$(INTDIR)\filesys.obj"
-	-@erase "$(INTDIR)\flock.obj"
-	-@erase "$(INTDIR)\fullrw.obj"
-	-@erase "$(INTDIR)\getopt.obj"
-	-@erase "$(INTDIR)\groupinfo.obj"
-	-@erase "$(INTDIR)\inet_ntop.obj"
-	-@erase "$(INTDIR)\inet_pton.obj"
-	-@erase "$(INTDIR)\internal.obj"
-	-@erase "$(INTDIR)\libapr.res"
-	-@erase "$(INTDIR)\libapr_src.idb"
-	-@erase "$(INTDIR)\libapr_src.pdb"
-	-@erase "$(INTDIR)\misc.obj"
-	-@erase "$(INTDIR)\mktemp.obj"
-	-@erase "$(INTDIR)\mmap.obj"
-	-@erase "$(INTDIR)\multicast.obj"
-	-@erase "$(INTDIR)\open.obj"
-	-@erase "$(INTDIR)\otherchild.obj"
-	-@erase "$(INTDIR)\pipe.obj"
-	-@erase "$(INTDIR)\poll.obj"
-	-@erase "$(INTDIR)\pollcb.obj"
-	-@erase "$(INTDIR)\pollset.obj"
-	-@erase "$(INTDIR)\proc.obj"
-	-@erase "$(INTDIR)\proc_mutex.obj"
-	-@erase "$(INTDIR)\rand.obj"
-	-@erase "$(INTDIR)\readwrite.obj"
-	-@erase "$(INTDIR)\seek.obj"
-	-@erase "$(INTDIR)\select.obj"
-	-@erase "$(INTDIR)\sendrecv.obj"
-	-@erase "$(INTDIR)\sha2.obj"
-	-@erase "$(INTDIR)\sha2_glue.obj"
-	-@erase "$(INTDIR)\shm.obj"
-	-@erase "$(INTDIR)\signals.obj"
-	-@erase "$(INTDIR)\sockaddr.obj"
-	-@erase "$(INTDIR)\socket_util.obj"
-	-@erase "$(INTDIR)\sockets.obj"
-	-@erase "$(INTDIR)\sockopt.obj"
-	-@erase "$(INTDIR)\start.obj"
-	-@erase "$(INTDIR)\tempdir.obj"
-	-@erase "$(INTDIR)\thread.obj"
-	-@erase "$(INTDIR)\thread_cond.obj"
-	-@erase "$(INTDIR)\thread_mutex.obj"
-	-@erase "$(INTDIR)\thread_rwlock.obj"
-	-@erase "$(INTDIR)\threadpriv.obj"
-	-@erase "$(INTDIR)\time.obj"
-	-@erase "$(INTDIR)\timestr.obj"
-	-@erase "$(INTDIR)\userinfo.obj"
-	-@erase "$(INTDIR)\utf8.obj"
-	-@erase "$(INTDIR)\version.obj"
-	-@erase "$(OUTDIR)\libapr-1.dll"
-	-@erase "$(OUTDIR)\libapr-1.exp"
-	-@erase "$(OUTDIR)\libapr-1.lib"
-	-@erase "$(OUTDIR)\libapr-1.pdb"
-	-@erase ".\include\apr.h"
-	-@erase ".\include\apr_gen_test_char.h"
-	-@erase "$(OUTDIR)\gen_test_char.exe"
-	-@erase "$(OUTDIR)\gen_test_char.obj"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_atomic.obj" \
-	"$(INTDIR)\dso.obj" \
-	"$(INTDIR)\apr_escape.obj" \
-	"$(INTDIR)\buffer.obj" \
-	"$(INTDIR)\copy.obj" \
-	"$(INTDIR)\dir.obj" \
-	"$(INTDIR)\fileacc.obj" \
-	"$(INTDIR)\filedup.obj" \
-	"$(INTDIR)\filepath.obj" \
-	"$(INTDIR)\filepath_util.obj" \
-	"$(INTDIR)\filestat.obj" \
-	"$(INTDIR)\filesys.obj" \
-	"$(INTDIR)\flock.obj" \
-	"$(INTDIR)\fullrw.obj" \
-	"$(INTDIR)\mktemp.obj" \
-	"$(INTDIR)\open.obj" \
-	"$(INTDIR)\pipe.obj" \
-	"$(INTDIR)\readwrite.obj" \
-	"$(INTDIR)\seek.obj" \
-	"$(INTDIR)\tempdir.obj" \
-	"$(INTDIR)\proc_mutex.obj" \
-	"$(INTDIR)\thread_cond.obj" \
-	"$(INTDIR)\thread_mutex.obj" \
-	"$(INTDIR)\thread_rwlock.obj" \
-	"$(INTDIR)\apr_pools.obj" \
-	"$(INTDIR)\charset.obj" \
-	"$(INTDIR)\env.obj" \
-	"$(INTDIR)\errorcodes.obj" \
-	"$(INTDIR)\getopt.obj" \
-	"$(INTDIR)\internal.obj" \
-	"$(INTDIR)\misc.obj" \
-	"$(INTDIR)\otherchild.obj" \
-	"$(INTDIR)\rand.obj" \
-	"$(INTDIR)\start.obj" \
-	"$(INTDIR)\utf8.obj" \
-	"$(INTDIR)\version.obj" \
-	"$(INTDIR)\common.obj" \
-	"$(INTDIR)\mmap.obj" \
-	"$(INTDIR)\inet_ntop.obj" \
-	"$(INTDIR)\inet_pton.obj" \
-	"$(INTDIR)\multicast.obj" \
-	"$(INTDIR)\sendrecv.obj" \
-	"$(INTDIR)\sockaddr.obj" \
-	"$(INTDIR)\sockets.obj" \
-	"$(INTDIR)\socket_util.obj" \
-	"$(INTDIR)\sockopt.obj" \
-	"$(INTDIR)\apr_getpass.obj" \
-	"$(INTDIR)\poll.obj" \
-	"$(INTDIR)\pollcb.obj" \
-	"$(INTDIR)\pollset.obj" \
-	"$(INTDIR)\select.obj" \
-	"$(INTDIR)\apr_random.obj" \
-	"$(INTDIR)\sha2.obj" \
-	"$(INTDIR)\sha2_glue.obj" \
-	"$(INTDIR)\shm.obj" \
-	"$(INTDIR)\apr_cpystrn.obj" \
-	"$(INTDIR)\apr_fnmatch.obj" \
-	"$(INTDIR)\apr_snprintf.obj" \
-	"$(INTDIR)\apr_strings.obj" \
-	"$(INTDIR)\apr_strnatcmp.obj" \
-	"$(INTDIR)\apr_strtok.obj" \
-	"$(INTDIR)\apr_hash.obj" \
-	"$(INTDIR)\apr_tables.obj" \
-	"$(INTDIR)\apr_skiplist.obj" \
-	"$(INTDIR)\proc.obj" \
-	"$(INTDIR)\signals.obj" \
-	"$(INTDIR)\thread.obj" \
-	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\time.obj" \
-	"$(INTDIR)\timestr.obj" \
-	"$(INTDIR)\groupinfo.obj" \
-	"$(INTDIR)\userinfo.obj" \
-	"$(INTDIR)\libapr.res"
-
-"$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\9x\Release\libapr-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\9x\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll"
-   if exist .\9x\Release\libapr-1.dll.manifest mt.exe -manifest .\9x\Release\libapr-1.dll.manifest -outputresource:.\9x\Release\libapr-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug9x"
-
-OUTDIR=.\9x\Debug
-INTDIR=.\9x\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\9x\Debug
-# End Custom Macros
-
-ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\Debug\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\apr_atomic.obj"
-	-@erase "$(INTDIR)\apr_cpystrn.obj"
-	-@erase "$(INTDIR)\apr_escape.obj"
-	-@erase "$(INTDIR)\apr_fnmatch.obj"
-	-@erase "$(INTDIR)\apr_getpass.obj"
-	-@erase "$(INTDIR)\apr_hash.obj"
-	-@erase "$(INTDIR)\apr_pools.obj"
-	-@erase "$(INTDIR)\apr_random.obj"
-	-@erase "$(INTDIR)\apr_skiplist.obj"
-	-@erase "$(INTDIR)\apr_snprintf.obj"
-	-@erase "$(INTDIR)\apr_strings.obj"
-	-@erase "$(INTDIR)\apr_strnatcmp.obj"
-	-@erase "$(INTDIR)\apr_strtok.obj"
-	-@erase "$(INTDIR)\apr_tables.obj"
-	-@erase "$(INTDIR)\buffer.obj"
-	-@erase "$(INTDIR)\charset.obj"
-	-@erase "$(INTDIR)\common.obj"
-	-@erase "$(INTDIR)\copy.obj"
-	-@erase "$(INTDIR)\dir.obj"
-	-@erase "$(INTDIR)\dso.obj"
-	-@erase "$(INTDIR)\env.obj"
-	-@erase "$(INTDIR)\errorcodes.obj"
-	-@erase "$(INTDIR)\fileacc.obj"
-	-@erase "$(INTDIR)\filedup.obj"
-	-@erase "$(INTDIR)\filepath.obj"
-	-@erase "$(INTDIR)\filepath_util.obj"
-	-@erase "$(INTDIR)\filestat.obj"
-	-@erase "$(INTDIR)\filesys.obj"
-	-@erase "$(INTDIR)\flock.obj"
-	-@erase "$(INTDIR)\fullrw.obj"
-	-@erase "$(INTDIR)\getopt.obj"
-	-@erase "$(INTDIR)\groupinfo.obj"
-	-@erase "$(INTDIR)\inet_ntop.obj"
-	-@erase "$(INTDIR)\inet_pton.obj"
-	-@erase "$(INTDIR)\internal.obj"
-	-@erase "$(INTDIR)\libapr.res"
-	-@erase "$(INTDIR)\libapr_src.idb"
-	-@erase "$(INTDIR)\libapr_src.pdb"
-	-@erase "$(INTDIR)\misc.obj"
-	-@erase "$(INTDIR)\mktemp.obj"
-	-@erase "$(INTDIR)\mmap.obj"
-	-@erase "$(INTDIR)\multicast.obj"
-	-@erase "$(INTDIR)\open.obj"
-	-@erase "$(INTDIR)\otherchild.obj"
-	-@erase "$(INTDIR)\pipe.obj"
-	-@erase "$(INTDIR)\poll.obj"
-	-@erase "$(INTDIR)\pollcb.obj"
-	-@erase "$(INTDIR)\pollset.obj"
-	-@erase "$(INTDIR)\proc.obj"
-	-@erase "$(INTDIR)\proc_mutex.obj"
-	-@erase "$(INTDIR)\rand.obj"
-	-@erase "$(INTDIR)\readwrite.obj"
-	-@erase "$(INTDIR)\seek.obj"
-	-@erase "$(INTDIR)\select.obj"
-	-@erase "$(INTDIR)\sendrecv.obj"
-	-@erase "$(INTDIR)\sha2.obj"
-	-@erase "$(INTDIR)\sha2_glue.obj"
-	-@erase "$(INTDIR)\shm.obj"
-	-@erase "$(INTDIR)\signals.obj"
-	-@erase "$(INTDIR)\sockaddr.obj"
-	-@erase "$(INTDIR)\socket_util.obj"
-	-@erase "$(INTDIR)\sockets.obj"
-	-@erase "$(INTDIR)\sockopt.obj"
-	-@erase "$(INTDIR)\start.obj"
-	-@erase "$(INTDIR)\tempdir.obj"
-	-@erase "$(INTDIR)\thread.obj"
-	-@erase "$(INTDIR)\thread_cond.obj"
-	-@erase "$(INTDIR)\thread_mutex.obj"
-	-@erase "$(INTDIR)\thread_rwlock.obj"
-	-@erase "$(INTDIR)\threadpriv.obj"
-	-@erase "$(INTDIR)\time.obj"
-	-@erase "$(INTDIR)\timestr.obj"
-	-@erase "$(INTDIR)\userinfo.obj"
-	-@erase "$(INTDIR)\utf8.obj"
-	-@erase "$(INTDIR)\version.obj"
-	-@erase "$(OUTDIR)\libapr-1.dll"
-	-@erase "$(OUTDIR)\libapr-1.exp"
-	-@erase "$(OUTDIR)\libapr-1.lib"
-	-@erase "$(OUTDIR)\libapr-1.pdb"
-	-@erase ".\include\apr.h"
-	-@erase ".\include\apr_gen_test_char.h"
-	-@erase "$(OUTDIR)\gen_test_char.exe"
-	-@erase "$(OUTDIR)\gen_test_char.obj"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /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" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_atomic.obj" \
-	"$(INTDIR)\dso.obj" \
-	"$(INTDIR)\apr_escape.obj" \
-	"$(INTDIR)\buffer.obj" \
-	"$(INTDIR)\copy.obj" \
-	"$(INTDIR)\dir.obj" \
-	"$(INTDIR)\fileacc.obj" \
-	"$(INTDIR)\filedup.obj" \
-	"$(INTDIR)\filepath.obj" \
-	"$(INTDIR)\filepath_util.obj" \
-	"$(INTDIR)\filestat.obj" \
-	"$(INTDIR)\filesys.obj" \
-	"$(INTDIR)\flock.obj" \
-	"$(INTDIR)\fullrw.obj" \
-	"$(INTDIR)\mktemp.obj" \
-	"$(INTDIR)\open.obj" \
-	"$(INTDIR)\pipe.obj" \
-	"$(INTDIR)\readwrite.obj" \
-	"$(INTDIR)\seek.obj" \
-	"$(INTDIR)\tempdir.obj" \
-	"$(INTDIR)\proc_mutex.obj" \
-	"$(INTDIR)\thread_cond.obj" \
-	"$(INTDIR)\thread_mutex.obj" \
-	"$(INTDIR)\thread_rwlock.obj" \
-	"$(INTDIR)\apr_pools.obj" \
-	"$(INTDIR)\charset.obj" \
-	"$(INTDIR)\env.obj" \
-	"$(INTDIR)\errorcodes.obj" \
-	"$(INTDIR)\getopt.obj" \
-	"$(INTDIR)\internal.obj" \
-	"$(INTDIR)\misc.obj" \
-	"$(INTDIR)\otherchild.obj" \
-	"$(INTDIR)\rand.obj" \
-	"$(INTDIR)\start.obj" \
-	"$(INTDIR)\utf8.obj" \
-	"$(INTDIR)\version.obj" \
-	"$(INTDIR)\common.obj" \
-	"$(INTDIR)\mmap.obj" \
-	"$(INTDIR)\inet_ntop.obj" \
-	"$(INTDIR)\inet_pton.obj" \
-	"$(INTDIR)\multicast.obj" \
-	"$(INTDIR)\sendrecv.obj" \
-	"$(INTDIR)\sockaddr.obj" \
-	"$(INTDIR)\sockets.obj" \
-	"$(INTDIR)\socket_util.obj" \
-	"$(INTDIR)\sockopt.obj" \
-	"$(INTDIR)\apr_getpass.obj" \
-	"$(INTDIR)\poll.obj" \
-	"$(INTDIR)\pollcb.obj" \
-	"$(INTDIR)\pollset.obj" \
-	"$(INTDIR)\select.obj" \
-	"$(INTDIR)\apr_random.obj" \
-	"$(INTDIR)\sha2.obj" \
-	"$(INTDIR)\sha2_glue.obj" \
-	"$(INTDIR)\shm.obj" \
-	"$(INTDIR)\apr_cpystrn.obj" \
-	"$(INTDIR)\apr_fnmatch.obj" \
-	"$(INTDIR)\apr_snprintf.obj" \
-	"$(INTDIR)\apr_strings.obj" \
-	"$(INTDIR)\apr_strnatcmp.obj" \
-	"$(INTDIR)\apr_strtok.obj" \
-	"$(INTDIR)\apr_hash.obj" \
-	"$(INTDIR)\apr_tables.obj" \
-	"$(INTDIR)\apr_skiplist.obj" \
-	"$(INTDIR)\proc.obj" \
-	"$(INTDIR)\signals.obj" \
-	"$(INTDIR)\thread.obj" \
-	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\time.obj" \
-	"$(INTDIR)\timestr.obj" \
-	"$(INTDIR)\groupinfo.obj" \
-	"$(INTDIR)\userinfo.obj" \
-	"$(INTDIR)\libapr.res"
-
-"$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\9x\Debug\libapr-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\9x\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll"
-   if exist .\9x\Debug\libapr-1.dll.manifest mt.exe -manifest .\9x\Debug\libapr-1.dll.manifest -outputresource:.\9x\Debug\libapr-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
 !ELSEIF  "$(CFG)" == "libapr - x64 Release"
 
 OUTDIR=.\x64\Release
 INTDIR=.\x64\Release
 DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
 # Begin Custom Macros
 OutDir=.\x64\Release
 # End Custom Macros
 
-ALL : ".\x64\Release\gen_test_char.exe" ".\include\apr_escape_test_char.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
+ALL : ".\include\apr.hw" ".\include\apr_escape.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
 
 
 CLEAN :
 	-@erase "$(INTDIR)\apr_atomic.obj"
+	-@erase "$(INTDIR)\apr_atomic64.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
+	-@erase "$(INTDIR)\apr_cpstr.obj"
+	-@erase "$(INTDIR)\apr_encode.obj"
 	-@erase "$(INTDIR)\apr_escape.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
 	-@erase "$(INTDIR)\apr_getpass.obj"
 	-@erase "$(INTDIR)\apr_hash.obj"
 	-@erase "$(INTDIR)\apr_pools.obj"
 	-@erase "$(INTDIR)\apr_random.obj"
 	-@erase "$(INTDIR)\apr_skiplist.obj"
 	-@erase "$(INTDIR)\apr_snprintf.obj"
 	-@erase "$(INTDIR)\apr_strings.obj"
 	-@erase "$(INTDIR)\apr_strnatcmp.obj"
 	-@erase "$(INTDIR)\apr_strtok.obj"
 	-@erase "$(INTDIR)\apr_tables.obj"
 	-@erase "$(INTDIR)\buffer.obj"
 	-@erase "$(INTDIR)\charset.obj"
 	-@erase "$(INTDIR)\common.obj"
 	-@erase "$(INTDIR)\copy.obj"
 	-@erase "$(INTDIR)\dir.obj"
 	-@erase "$(INTDIR)\dso.obj"
 	-@erase "$(INTDIR)\env.obj"
 	-@erase "$(INTDIR)\errorcodes.obj"
 	-@erase "$(INTDIR)\fileacc.obj"
 	-@erase "$(INTDIR)\filedup.obj"
 	-@erase "$(INTDIR)\filepath.obj"
 	-@erase "$(INTDIR)\filepath_util.obj"
 	-@erase "$(INTDIR)\filestat.obj"
 	-@erase "$(INTDIR)\filesys.obj"
 	-@erase "$(INTDIR)\flock.obj"
 	-@erase "$(INTDIR)\fullrw.obj"
 	-@erase "$(INTDIR)\getopt.obj"
 	-@erase "$(INTDIR)\groupinfo.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
 	-@erase "$(INTDIR)\inet_pton.obj"
 	-@erase "$(INTDIR)\internal.obj"
 	-@erase "$(INTDIR)\libapr.res"
 	-@erase "$(INTDIR)\libapr_src.idb"
 	-@erase "$(INTDIR)\libapr_src.pdb"
 	-@erase "$(INTDIR)\misc.obj"
 	-@erase "$(INTDIR)\mktemp.obj"
 	-@erase "$(INTDIR)\mmap.obj"
 	-@erase "$(INTDIR)\multicast.obj"
 	-@erase "$(INTDIR)\open.obj"
 	-@erase "$(INTDIR)\otherchild.obj"
 	-@erase "$(INTDIR)\pipe.obj"
 	-@erase "$(INTDIR)\poll.obj"
 	-@erase "$(INTDIR)\pollcb.obj"
 	-@erase "$(INTDIR)\pollset.obj"
+	-@erase "$(INTDIR)\wakeup.obj"
 	-@erase "$(INTDIR)\proc.obj"
 	-@erase "$(INTDIR)\proc_mutex.obj"
 	-@erase "$(INTDIR)\rand.obj"
 	-@erase "$(INTDIR)\readwrite.obj"
 	-@erase "$(INTDIR)\seek.obj"
 	-@erase "$(INTDIR)\select.obj"
 	-@erase "$(INTDIR)\sendrecv.obj"
 	-@erase "$(INTDIR)\sha2.obj"
 	-@erase "$(INTDIR)\sha2_glue.obj"
 	-@erase "$(INTDIR)\shm.obj"
 	-@erase "$(INTDIR)\signals.obj"
 	-@erase "$(INTDIR)\sockaddr.obj"
 	-@erase "$(INTDIR)\socket_util.obj"
 	-@erase "$(INTDIR)\sockets.obj"
 	-@erase "$(INTDIR)\sockopt.obj"
 	-@erase "$(INTDIR)\start.obj"
 	-@erase "$(INTDIR)\tempdir.obj"
 	-@erase "$(INTDIR)\thread.obj"
 	-@erase "$(INTDIR)\thread_cond.obj"
 	-@erase "$(INTDIR)\thread_mutex.obj"
 	-@erase "$(INTDIR)\thread_rwlock.obj"
 	-@erase "$(INTDIR)\threadpriv.obj"
 	-@erase "$(INTDIR)\time.obj"
 	-@erase "$(INTDIR)\timestr.obj"
 	-@erase "$(INTDIR)\userinfo.obj"
 	-@erase "$(INTDIR)\utf8.obj"
 	-@erase "$(INTDIR)\version.obj"
 	-@erase "$(OUTDIR)\libapr-1.dll"
 	-@erase "$(OUTDIR)\libapr-1.exp"
 	-@erase "$(OUTDIR)\libapr-1.lib"
 	-@erase "$(OUTDIR)\libapr-1.pdb"
 	-@erase ".\include\apr.h"
 	-@erase ".\include\apr_gen_test_char.h"
 	-@erase "$(OUTDIR)\gen_test_char.exe"
 	-@erase "$(OUTDIR)\gen_test_char.obj"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /c 
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
 RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_VERSION_ONLY" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X64 /opt:ref 
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib"  /opt:ref 
 LINK32_OBJS= \
 	"$(INTDIR)\apr_atomic.obj" \
+	"$(INTDIR)\apr_atomic64.obj" \
 	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\apr_encode.obj" \
 	"$(INTDIR)\apr_escape.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\copy.obj" \
 	"$(INTDIR)\dir.obj" \
 	"$(INTDIR)\fileacc.obj" \
 	"$(INTDIR)\filedup.obj" \
 	"$(INTDIR)\filepath.obj" \
 	"$(INTDIR)\filepath_util.obj" \
 	"$(INTDIR)\filestat.obj" \
 	"$(INTDIR)\filesys.obj" \
 	"$(INTDIR)\flock.obj" \
 	"$(INTDIR)\fullrw.obj" \
 	"$(INTDIR)\mktemp.obj" \
 	"$(INTDIR)\open.obj" \
 	"$(INTDIR)\pipe.obj" \
 	"$(INTDIR)\readwrite.obj" \
 	"$(INTDIR)\seek.obj" \
 	"$(INTDIR)\tempdir.obj" \
 	"$(INTDIR)\proc_mutex.obj" \
 	"$(INTDIR)\thread_cond.obj" \
 	"$(INTDIR)\thread_mutex.obj" \
 	"$(INTDIR)\thread_rwlock.obj" \
 	"$(INTDIR)\apr_pools.obj" \
 	"$(INTDIR)\charset.obj" \
 	"$(INTDIR)\env.obj" \
 	"$(INTDIR)\errorcodes.obj" \
 	"$(INTDIR)\getopt.obj" \
 	"$(INTDIR)\internal.obj" \
 	"$(INTDIR)\misc.obj" \
 	"$(INTDIR)\otherchild.obj" \
 	"$(INTDIR)\rand.obj" \
 	"$(INTDIR)\start.obj" \
 	"$(INTDIR)\utf8.obj" \
 	"$(INTDIR)\version.obj" \
 	"$(INTDIR)\common.obj" \
 	"$(INTDIR)\mmap.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
 	"$(INTDIR)\inet_pton.obj" \
 	"$(INTDIR)\multicast.obj" \
 	"$(INTDIR)\sendrecv.obj" \
 	"$(INTDIR)\sockaddr.obj" \
 	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\socket_util.obj" \
 	"$(INTDIR)\sockopt.obj" \
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\poll.obj" \
 	"$(INTDIR)\pollcb.obj" \
 	"$(INTDIR)\pollset.obj" \
+	"$(INTDIR)\wakeup.obj" \
 	"$(INTDIR)\select.obj" \
 	"$(INTDIR)\apr_random.obj" \
 	"$(INTDIR)\sha2.obj" \
 	"$(INTDIR)\sha2_glue.obj" \
 	"$(INTDIR)\shm.obj" \
 	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_cstr.obj" \
 	"$(INTDIR)\apr_fnmatch.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_strings.obj" \
 	"$(INTDIR)\apr_strnatcmp.obj" \
 	"$(INTDIR)\apr_strtok.obj" \
 	"$(INTDIR)\apr_hash.obj" \
 	"$(INTDIR)\apr_tables.obj" \
 	"$(INTDIR)\apr_skiplist.obj" \
 	"$(INTDIR)\proc.obj" \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
 	"$(INTDIR)\userinfo.obj" \
 	"$(INTDIR)\libapr.res"
 
 "$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
 TargetPath=.\x64\Release\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
 
 # Begin Custom Macros
 OutDir=.\x64\Release
 # End Custom Macros
 
 "$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll"
    if exist .\x64\Release\libapr-1.dll.manifest mt.exe -manifest .\x64\Release\libapr-1.dll.manifest -outputresource:.\x64\Release\libapr-1.dll;2
 	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
 
 !ELSEIF  "$(CFG)" == "libapr - x64 Debug"
 
 OUTDIR=.\x64\Debug
 INTDIR=.\x64\Debug
 DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
 # Begin Custom Macros
 OutDir=.\x64\Debug
 # End Custom Macros
 
-ALL : ".\x64\Debug\gen_test_char.exe" ".\include\apr_escape_test_char.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
+ALL : ".\include\apr.hw" ".\include\apr_escape.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
 
 
 CLEAN :
 	-@erase "$(INTDIR)\apr_atomic.obj"
+	-@erase "$(INTDIR)\apr_atomic64.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
+	-@erase "$(INTDIR)\apr_cpstr.obj"
+	-@erase "$(INTDIR)\apr_encode.obj"
 	-@erase "$(INTDIR)\apr_escape.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
 	-@erase "$(INTDIR)\apr_getpass.obj"
 	-@erase "$(INTDIR)\apr_hash.obj"
 	-@erase "$(INTDIR)\apr_pools.obj"
 	-@erase "$(INTDIR)\apr_random.obj"
 	-@erase "$(INTDIR)\apr_skiplist.obj"
 	-@erase "$(INTDIR)\apr_snprintf.obj"
 	-@erase "$(INTDIR)\apr_strings.obj"
 	-@erase "$(INTDIR)\apr_strnatcmp.obj"
 	-@erase "$(INTDIR)\apr_strtok.obj"
 	-@erase "$(INTDIR)\apr_tables.obj"
 	-@erase "$(INTDIR)\buffer.obj"
 	-@erase "$(INTDIR)\charset.obj"
 	-@erase "$(INTDIR)\common.obj"
 	-@erase "$(INTDIR)\copy.obj"
 	-@erase "$(INTDIR)\dir.obj"
 	-@erase "$(INTDIR)\dso.obj"
 	-@erase "$(INTDIR)\env.obj"
 	-@erase "$(INTDIR)\errorcodes.obj"
 	-@erase "$(INTDIR)\fileacc.obj"
 	-@erase "$(INTDIR)\filedup.obj"
 	-@erase "$(INTDIR)\filepath.obj"
 	-@erase "$(INTDIR)\filepath_util.obj"
 	-@erase "$(INTDIR)\filestat.obj"
 	-@erase "$(INTDIR)\filesys.obj"
 	-@erase "$(INTDIR)\flock.obj"
 	-@erase "$(INTDIR)\fullrw.obj"
 	-@erase "$(INTDIR)\getopt.obj"
 	-@erase "$(INTDIR)\groupinfo.obj"
 	-@erase "$(INTDIR)\inet_ntop.obj"
 	-@erase "$(INTDIR)\inet_pton.obj"
 	-@erase "$(INTDIR)\internal.obj"
 	-@erase "$(INTDIR)\libapr.res"
 	-@erase "$(INTDIR)\libapr_src.idb"
 	-@erase "$(INTDIR)\libapr_src.pdb"
 	-@erase "$(INTDIR)\misc.obj"
 	-@erase "$(INTDIR)\mktemp.obj"
 	-@erase "$(INTDIR)\mmap.obj"
 	-@erase "$(INTDIR)\multicast.obj"
 	-@erase "$(INTDIR)\open.obj"
 	-@erase "$(INTDIR)\otherchild.obj"
 	-@erase "$(INTDIR)\pipe.obj"
 	-@erase "$(INTDIR)\poll.obj"
 	-@erase "$(INTDIR)\pollcb.obj"
 	-@erase "$(INTDIR)\pollset.obj"
+	-@erase "$(INTDIR)\wakeup.obj"
 	-@erase "$(INTDIR)\proc.obj"
 	-@erase "$(INTDIR)\proc_mutex.obj"
 	-@erase "$(INTDIR)\rand.obj"
 	-@erase "$(INTDIR)\readwrite.obj"
 	-@erase "$(INTDIR)\seek.obj"
 	-@erase "$(INTDIR)\select.obj"
 	-@erase "$(INTDIR)\sendrecv.obj"
 	-@erase "$(INTDIR)\sha2.obj"
 	-@erase "$(INTDIR)\sha2_glue.obj"
 	-@erase "$(INTDIR)\shm.obj"
 	-@erase "$(INTDIR)\signals.obj"
 	-@erase "$(INTDIR)\sockaddr.obj"
 	-@erase "$(INTDIR)\socket_util.obj"
 	-@erase "$(INTDIR)\sockets.obj"
 	-@erase "$(INTDIR)\sockopt.obj"
 	-@erase "$(INTDIR)\start.obj"
 	-@erase "$(INTDIR)\tempdir.obj"
 	-@erase "$(INTDIR)\thread.obj"
 	-@erase "$(INTDIR)\thread_cond.obj"
 	-@erase "$(INTDIR)\thread_mutex.obj"
 	-@erase "$(INTDIR)\thread_rwlock.obj"
 	-@erase "$(INTDIR)\threadpriv.obj"
 	-@erase "$(INTDIR)\time.obj"
 	-@erase "$(INTDIR)\timestr.obj"
 	-@erase "$(INTDIR)\userinfo.obj"
 	-@erase "$(INTDIR)\utf8.obj"
 	-@erase "$(INTDIR)\version.obj"
 	-@erase "$(OUTDIR)\libapr-1.dll"
 	-@erase "$(OUTDIR)\libapr-1.exp"
 	-@erase "$(OUTDIR)\libapr-1.lib"
 	-@erase "$(OUTDIR)\libapr-1.pdb"
 	-@erase ".\include\apr.h"
 	-@erase ".\include\apr_gen_test_char.h"
 	-@erase "$(OUTDIR)\gen_test_char.exe"
 	-@erase "$(OUTDIR)\gen_test_char.obj"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c 
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD /EHsc /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
    $(CPP_PROJ) $< 
 <<
 
 MTL=midl.exe
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
 RSC=rc.exe
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_VERSION_ONLY" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X64 
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib"  
 LINK32_OBJS= \
 	"$(INTDIR)\apr_atomic.obj" \
+	"$(INTDIR)\apr_atomic64.obj" \
 	"$(INTDIR)\dso.obj" \
+	"$(INTDIR)\apr_encode.obj" \
 	"$(INTDIR)\apr_escape.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\copy.obj" \
 	"$(INTDIR)\dir.obj" \
 	"$(INTDIR)\fileacc.obj" \
 	"$(INTDIR)\filedup.obj" \
 	"$(INTDIR)\filepath.obj" \
 	"$(INTDIR)\filepath_util.obj" \
 	"$(INTDIR)\filestat.obj" \
 	"$(INTDIR)\filesys.obj" \
 	"$(INTDIR)\flock.obj" \
 	"$(INTDIR)\fullrw.obj" \
 	"$(INTDIR)\mktemp.obj" \
 	"$(INTDIR)\open.obj" \
 	"$(INTDIR)\pipe.obj" \
 	"$(INTDIR)\readwrite.obj" \
 	"$(INTDIR)\seek.obj" \
 	"$(INTDIR)\tempdir.obj" \
 	"$(INTDIR)\proc_mutex.obj" \
 	"$(INTDIR)\thread_cond.obj" \
 	"$(INTDIR)\thread_mutex.obj" \
 	"$(INTDIR)\thread_rwlock.obj" \
 	"$(INTDIR)\apr_pools.obj" \
 	"$(INTDIR)\charset.obj" \
 	"$(INTDIR)\env.obj" \
 	"$(INTDIR)\errorcodes.obj" \
 	"$(INTDIR)\getopt.obj" \
 	"$(INTDIR)\internal.obj" \
 	"$(INTDIR)\misc.obj" \
 	"$(INTDIR)\otherchild.obj" \
 	"$(INTDIR)\rand.obj" \
 	"$(INTDIR)\start.obj" \
 	"$(INTDIR)\utf8.obj" \
 	"$(INTDIR)\version.obj" \
 	"$(INTDIR)\common.obj" \
 	"$(INTDIR)\mmap.obj" \
 	"$(INTDIR)\inet_ntop.obj" \
 	"$(INTDIR)\inet_pton.obj" \
 	"$(INTDIR)\multicast.obj" \
 	"$(INTDIR)\sendrecv.obj" \
 	"$(INTDIR)\sockaddr.obj" \
 	"$(INTDIR)\sockets.obj" \
 	"$(INTDIR)\socket_util.obj" \
 	"$(INTDIR)\sockopt.obj" \
 	"$(INTDIR)\apr_getpass.obj" \
 	"$(INTDIR)\poll.obj" \
 	"$(INTDIR)\pollcb.obj" \
 	"$(INTDIR)\pollset.obj" \
+	"$(INTDIR)\wakeup.obj" \
 	"$(INTDIR)\select.obj" \
 	"$(INTDIR)\apr_random.obj" \
 	"$(INTDIR)\sha2.obj" \
 	"$(INTDIR)\sha2_glue.obj" \
 	"$(INTDIR)\shm.obj" \
 	"$(INTDIR)\apr_cpystrn.obj" \
+	"$(INTDIR)\apr_cstr.obj" \
 	"$(INTDIR)\apr_fnmatch.obj" \
 	"$(INTDIR)\apr_snprintf.obj" \
 	"$(INTDIR)\apr_strings.obj" \
 	"$(INTDIR)\apr_strnatcmp.obj" \
 	"$(INTDIR)\apr_strtok.obj" \
 	"$(INTDIR)\apr_hash.obj" \
 	"$(INTDIR)\apr_tables.obj" \
 	"$(INTDIR)\apr_skiplist.obj" \
 	"$(INTDIR)\proc.obj" \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
 	"$(INTDIR)\userinfo.obj" \
 	"$(INTDIR)\libapr.res"
 
 "$(OUTDIR)\libapr-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
 TargetPath=.\x64\Debug\libapr-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
 
 # Begin Custom Macros
 OutDir=.\x64\Debug
 # End Custom Macros
 
 "$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll"
    if exist .\x64\Debug\libapr-1.dll.manifest mt.exe -manifest .\x64\Debug\libapr-1.dll.manifest -outputresource:.\x64\Debug\libapr-1.dll;2
 	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
 
 !ENDIF 
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("libapr.dep")
 !INCLUDE "libapr.dep"
 !ELSE 
 !MESSAGE Warning: cannot find "libapr.dep"
 !ENDIF 
 !ENDIF 
 
 
-!IF "$(CFG)" == "libapr - Win32 Release" || "$(CFG)" == "libapr - Win32 Debug" || "$(CFG)" == "libapr - Win32 Release9x" || "$(CFG)" == "libapr - Win32 Debug9x" || "$(CFG)" == "libapr - x64 Release" || "$(CFG)" == "libapr - x64 Debug"
+!IF "$(CFG)" == "libapr - Win32 Release" || "$(CFG)" == "libapr - Win32 Debug" || "$(CFG)" == "libapr - x64 Release" || "$(CFG)" == "libapr - x64 Debug"
 SOURCE=.\atomic\win32\apr_atomic.c
 
 "$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\atomic\win32\apr_atomic64.c
+
+"$(INTDIR)\apr_atomic64.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\dso\win32\dso.c
 
 "$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\encoding\apr_encode.c
+
+"$(INTDIR)\apr_encode.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\encoding\apr_escape.c
 
 "$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_escape.h" ".\include\apr_escape_test_char.h" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\buffer.c
 
 "$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\copy.c
 
 "$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\dir.c
 
 "$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\fileacc.c
 
 "$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filedup.c
 
 "$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filepath.c
 
 "$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\filepath_util.c
 
 "$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filestat.c
 
 "$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filesys.c
 
 "$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\flock.c
 
 "$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\fullrw.c
 
 "$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\mktemp.c
 
 "$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\open.c
 
 "$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\pipe.c
 
 "$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\readwrite.c
 
 "$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\seek.c
 
 "$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\tempdir.c
 
 "$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\proc_mutex.c
 
 "$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_cond.c
 
 "$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_mutex.c
 
 "$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_rwlock.c
 
 "$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\memory\unix\apr_pools.c
 
 "$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\apr_app.c
 SOURCE=.\misc\win32\charset.c
 
 "$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\env.c
 
 "$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\errorcodes.c
 
 "$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\getopt.c
 
 "$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\internal.c
 
 "$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\misc.c
 
 "$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\otherchild.c
 
 "$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\rand.c
 
 "$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\start.c
 
 "$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\utf8.c
 
 "$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\version.c
 
 "$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\mmap\unix\common.c
 
 "$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\mmap\win32\mmap.c
 
 "$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\inet_ntop.c
 
 "$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\inet_pton.c
 
 "$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\multicast.c
 
 "$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sendrecv.c
 
 "$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\sockaddr.c
 
 "$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\socket_util.c
 
 "$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sockets.c
 
 "$(INTDIR)\sockets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sockopt.c
 
 "$(INTDIR)\sockopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\passwd\apr_getpass.c
 
 "$(INTDIR)\apr_getpass.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\poll.c
 
 "$(INTDIR)\poll.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\pollcb.c
 
 "$(INTDIR)\pollcb.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\pollset.c
 
 "$(INTDIR)\pollset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\select.c
 
 "$(INTDIR)\select.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\poll\unix\wakeup.c
+
+"$(INTDIR)\wakeup.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\random\unix\apr_random.c
 
 "$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\random\unix\sha2.c
 
 "$(INTDIR)\sha2.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\random\unix\sha2_glue.c
 
 "$(INTDIR)\sha2_glue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\shmem\win32\shm.c
 
 "$(INTDIR)\shm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_cpystrn.c
 
 "$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\strings\apr_cstr.c
+
+"$(INTDIR)\apr_cstr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_cstr.h"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\strings\apr_fnmatch.c
 
 "$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_snprintf.c
 
 "$(INTDIR)\apr_snprintf.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strings.c
 
 "$(INTDIR)\apr_strings.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strnatcmp.c
 
 "$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strtok.c
 
 "$(INTDIR)\apr_strtok.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\tables\apr_hash.c
 
 "$(INTDIR)\apr_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\tables\apr_skiplist.c
 
 "$(INTDIR)\apr_skiplist.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\tables\apr_tables.c
 
 "$(INTDIR)\apr_tables.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\proc.c
 
 "$(INTDIR)\proc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\signals.c
 
 "$(INTDIR)\signals.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\thread.c
 
 "$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\threadpriv.c
 
 "$(INTDIR)\threadpriv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\time\win32\time.c
 
 "$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\time\win32\timestr.c
 
 "$(INTDIR)\timestr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\user\win32\groupinfo.c
 
 "$(INTDIR)\groupinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\user\win32\userinfo.c
 
 "$(INTDIR)\userinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\include\apr.hw
 
 !IF  "$(CFG)" == "libapr - Win32 Release"
 
 InputPath=.\include\apr.hw
 
 ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
 
 InputPath=.\include\apr.hw
 
 ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
 << 
 	
 
-!ELSEIF  "$(CFG)" == "libapr - Win32 Release9x"
-
-InputPath=.\include\apr.hw
-
-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug9x"
-
-InputPath=.\include\apr.hw
-
-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
 !ELSEIF  "$(CFG)" == "libapr - x64 Release"
 
 InputPath=.\include\apr.hw
 
 ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "libapr - x64 Debug"
 
 InputPath=.\include\apr.hw
 
 ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
 << 
 	
 
 !ENDIF 
 
 SOURCE=.\include\apr_escape.h
 
 !IF  "$(CFG)" == "libapr - Win32 Release"
 
 InputPath=.\include\apr_escape.h
 
 "$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Release\gen_test_char /Fe.\Release\gen_test_char.exe .\tools\gen_test_char.c 
 	.\Release\gen_test_char.exe > .\include\apr_escape_test_char.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
 
 InputPath=.\include\apr_escape.h
 
 "$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\Debug\gen_test_char /Fe.\Debug\gen_test_char.exe .\tools\gen_test_char.c 
 	.\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "libapr - Win32 Release9x"
 
 InputPath=.\include\apr_escape.h
 
 "$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\Release\gen_test_char /Fe.\9x\Release\gen_test_char.exe .\tools\gen_test_char.c 
 	.\9x\Release\gen_test_char.exe > .\include\apr_escape_test_char.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "libapr - Win32 Debug9x"
 
 InputPath=.\include\apr_escape.h
 
 "$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\9x\Debug\gen_test_char /Fe.\9x\Debug\gen_test_char.exe .\tools\gen_test_char.c 
 	.\9x\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "libapr - x64 Release"
 
 InputPath=.\include\apr_escape.h
 
 "$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	cl.exe /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Release\gen_test_char /Fe.\x64\Release\gen_test_char.exe .\tools\gen_test_char.c 
 	.\x64\Release\gen_test_char.exe > .\include\apr_escape_test_char.h
 << 
 	
 
 !ELSEIF  "$(CFG)" == "libapr - x64 Debug"
 
 InputPath=.\include\apr_escape.h
 
 "$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" /Fo.\x64\Debug\gen_test_char /Fe.\x64\Debug\gen_test_char.exe .\tools\gen_test_char.c 
 	.\x64\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h
 << 
 	
 
 !ENDIF 
 
-SOURCE=.\include\apr_want.h
-
-!IF  "$(CFG)" == "libapr - Win32 Release"
-
-InputPath=.\include\apr_want.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
-
-InputPath=.\include\apr_want.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Release9x"
-
-InputPath=.\include\apr_want.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug9x"
-
-InputPath=.\include\apr_want.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libapr - x64 Release"
-
-InputPath=.\include\apr_want.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "libapr - x64 Debug"
-
-InputPath=.\include\apr_want.h
-
-".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\include\apr.hw > .\include\apr.h
-<< 
-	
-
-!ENDIF 
 
 SOURCE=.\libapr.rc
 
 "$(INTDIR)\libapr.res" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(RSC) $(RSC_PROJ) $(SOURCE)
 
 
 
 !ENDIF 
 
Index: head/contrib/apr/locks/unix/global_mutex.c
===================================================================
--- head/contrib/apr/locks/unix/global_mutex.c	(revision 361677)
+++ head/contrib/apr/locks/unix/global_mutex.c	(revision 361678)
@@ -1,188 +1,245 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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) {
+    if (m->proc_mutex->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_timedlock(apr_global_mutex_t *mutex,
+                                                 apr_interval_time_t timeout)
+{
+#if APR_HAS_TIMEDLOCKS
+    apr_status_t rv;
+
+#if APR_HAS_THREADS
+    if (mutex->thread_mutex) {
+        apr_time_t expiry = 0;
+        if (timeout > 0) {
+            expiry = apr_time_now() + timeout;
+        }
+        rv = apr_thread_mutex_timedlock(mutex->thread_mutex, timeout);
+        if (rv != APR_SUCCESS) {
+            return rv;
+        }
+        if (expiry) {
+            timeout = expiry - apr_time_now();
+            if (timeout < 0) {
+                timeout = 0;
+            }
+        }
+    }
+#endif /* APR_HAS_THREADS */
+
+    rv = apr_proc_mutex_timedlock(mutex->proc_mutex, timeout);
+
+#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;
+#else  /* APR_HAS_TIMEDLOCKS */
+    return APR_ENOTIMPL;
+#endif
+}
+
 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_DECLARE(const char *) apr_global_mutex_lockfile(apr_global_mutex_t *mutex)
 {
     return apr_proc_mutex_lockfile(mutex->proc_mutex);
 }
 
+APR_DECLARE(apr_lockmech_e) apr_global_mutex_mech(apr_global_mutex_t *mutex)
+{
+    return apr_proc_mutex_mech(mutex->proc_mutex);
+}
+
 APR_DECLARE(const char *) apr_global_mutex_name(apr_global_mutex_t *mutex)
 {
     return apr_proc_mutex_name(mutex->proc_mutex);
 }
 
+APR_PERMS_SET_IMPLEMENT(global_mutex)
+{
+    apr_status_t rv;
+    apr_global_mutex_t *mutex = (apr_global_mutex_t *)theglobal_mutex;
+
+    rv = APR_PERMS_SET_FN(proc_mutex)(mutex->proc_mutex, perms, uid, gid);
+    return rv;
+}
+
 APR_POOL_IMPLEMENT_ACCESSOR(global_mutex)
+
Index: head/contrib/apr/locks/unix/proc_mutex.c
===================================================================
--- head/contrib/apr/locks/unix/proc_mutex.c	(revision 361677)
+++ head/contrib/apr/locks/unix/proc_mutex.c	(revision 361678)
@@ -1,1001 +1,1695 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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() */
 #include "apr_hash.h"
+#include "apr_atomic.h"
 
 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);
 }
 
 #if APR_HAS_POSIXSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || \
-    APR_HAS_PROC_PTHREAD_SERIALIZE || APR_HAS_SYSVSEM_SERIALIZE
+    APR_HAS_SYSVSEM_SERIALIZE
 static apr_status_t proc_mutex_no_child_init(apr_proc_mutex_t **mutex,
                                              apr_pool_t *cont,
                                              const char *fname)
 {
     return APR_SUCCESS;
 }
 #endif    
 
+#if APR_HAS_POSIXSEM_SERIALIZE || APR_HAS_PROC_PTHREAD_SERIALIZE
+static apr_status_t proc_mutex_no_perms_set(apr_proc_mutex_t *mutex,
+                                            apr_fileperms_t perms,
+                                            apr_uid_t uid,
+                                            apr_gid_t gid)
+{
+    return APR_ENOTIMPL;
+}
+#endif    
+
+#if APR_HAS_FCNTL_SERIALIZE \
+    || APR_HAS_FLOCK_SERIALIZE \
+    || (APR_HAS_SYSVSEM_SERIALIZE \
+        && !defined(HAVE_SEMTIMEDOP)) \
+    || (APR_HAS_POSIXSEM_SERIALIZE \
+        && !defined(HAVE_SEM_TIMEDWAIT)) \
+    || (APR_HAS_PROC_PTHREAD_SERIALIZE \
+        && !defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) \
+        && !defined(HAVE_PTHREAD_CONDATTR_SETPSHARED))
+static apr_status_t proc_mutex_spinsleep_timedacquire(apr_proc_mutex_t *mutex,
+                                                  apr_interval_time_t timeout)
+{
+#define SLEEP_TIME apr_time_from_msec(10)
+    apr_status_t rv;
+    for (;;) {
+        rv = apr_proc_mutex_trylock(mutex);
+        if (!APR_STATUS_IS_EBUSY(rv)) {
+            if (rv == APR_SUCCESS) {
+                mutex->curr_locked = 1;
+            }
+            break;
+        }
+        if (timeout <= 0) {
+            rv = APR_TIMEUP;
+            break;
+        }
+        if (timeout > SLEEP_TIME) {
+            apr_sleep(SLEEP_TIME);
+            timeout -= SLEEP_TIME;
+        }
+        else {
+            apr_sleep(timeout);
+            timeout = 0;
+        }
+    }
+    return rv;
+}
+#endif
+
 #if APR_HAS_POSIXSEM_SERIALIZE
 
 #ifndef SEM_FAILED
 #define SEM_FAILED (-1)
 #endif
 
 static apr_status_t proc_mutex_posix_cleanup(void *mutex_)
 {
     apr_proc_mutex_t *mutex = mutex_;
     
-    if (sem_close(mutex->psem_interproc) < 0) {
+    if (sem_close(mutex->os.psem_interproc) < 0) {
         return errno;
     }
 
     return APR_SUCCESS;
 }    
 
 static unsigned int rshash (char *p) {
     /* hash function from Robert Sedgwicks 'Algorithms in C' book */
    unsigned int b    = 378551;
    unsigned int a    = 63689;
    unsigned int retval = 0;
 
    for( ; *p; p++)
    {
       retval = retval * a + (*p);
       a *= b;
    }
 
    return retval;
 }
 
 static apr_status_t proc_mutex_posix_create(apr_proc_mutex_t *new_mutex,
                                             const char *fname)
 {
     #define APR_POSIXSEM_NAME_MIN 13
     sem_t *psem;
     char semname[32];
     
-    new_mutex->interproc = apr_palloc(new_mutex->pool,
-                                      sizeof(*new_mutex->interproc));
     /*
      * 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 use fname to generate a (unique) hash
      * and use that as the name of the semaphore. If no filename was
      * given, we create one based on the time. We tuck the name
      * away, since it might be useful for debugging. We use 2 hashing
      * functions to try to avoid collisions.
      *
      * 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.
      *
      */
     if (fname) {
         apr_ssize_t flen = strlen(fname);
         char *p = apr_pstrndup(new_mutex->pool, fname, strlen(fname));
         unsigned int h1, h2;
         h1 = (apr_hashfunc_default((const char *)p, &flen) & 0xffffffff);
         h2 = (rshash(p) & 0xffffffff);
         apr_snprintf(semname, sizeof(semname), "/ApR.%xH%x", h1, h2);
     } else {
         apr_time_t now;
         unsigned long sec;
         unsigned long usec;
         now = apr_time_now();
         sec = apr_time_sec(now);
         usec = apr_time_usec(now);
         apr_snprintf(semname, sizeof(semname), "/ApR.%lxZ%lx", sec, usec);
     }
     do {
         psem = sem_open(semname, O_CREAT | O_EXCL, 0644, 1);
     } while (psem == (sem_t *)SEM_FAILED && errno == EINTR);
     if (psem == (sem_t *)SEM_FAILED) {
         if (errno == ENAMETOOLONG) {
             /* Oh well, good try */
             semname[APR_POSIXSEM_NAME_MIN] = '\0';
         } else {
             return errno;
         }
         do {
             psem = sem_open(semname, O_CREAT | O_EXCL, 0644, 1);
         } while (psem == (sem_t *)SEM_FAILED && errno == EINTR);
     }
 
     if (psem == (sem_t *)SEM_FAILED) {
         return errno;
     }
     /* Ahhh. The joys of Posix sems. Predelete it... */
     sem_unlink(semname);
-    new_mutex->psem_interproc = psem;
+    new_mutex->os.psem_interproc = psem;
     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;
 
     do {
-        rc = sem_wait(mutex->psem_interproc);
+        rc = sem_wait(mutex->os.psem_interproc);
     } while (rc < 0 && errno == EINTR);
     if (rc < 0) {
         return errno;
     }
     mutex->curr_locked = 1;
     return APR_SUCCESS;
 }
 
 static apr_status_t proc_mutex_posix_tryacquire(apr_proc_mutex_t *mutex)
 {
     int rc;
 
     do {
-        rc = sem_trywait(mutex->psem_interproc);
+        rc = sem_trywait(mutex->os.psem_interproc);
     } while (rc < 0 && errno == EINTR);
     if (rc < 0) {
         if (errno == EAGAIN) {
             return APR_EBUSY;
         }
         return errno;
     }
     mutex->curr_locked = 1;
     return APR_SUCCESS;
 }
 
+#if defined(HAVE_SEM_TIMEDWAIT)
+static apr_status_t proc_mutex_posix_timedacquire(apr_proc_mutex_t *mutex,
+                                              apr_interval_time_t timeout)
+{
+    if (timeout <= 0) {
+        apr_status_t rv = proc_mutex_posix_tryacquire(mutex);
+        return (rv == APR_EBUSY) ? APR_TIMEUP : rv;
+    }
+    else {
+        int rc;
+        struct timespec abstime;
+
+        timeout += apr_time_now();
+        abstime.tv_sec = apr_time_sec(timeout);
+        abstime.tv_nsec = apr_time_usec(timeout) * 1000; /* nanoseconds */
+        
+        do {
+            rc = sem_timedwait(mutex->os.psem_interproc, &abstime);
+        } while (rc < 0 && errno == EINTR);
+        if (rc < 0) {
+            if (errno == ETIMEDOUT) {
+                return APR_TIMEUP;
+            }
+            return errno;
+        }
+    }
+    mutex->curr_locked = 1;
+    return APR_SUCCESS;
+}
+#endif
+
 static apr_status_t proc_mutex_posix_release(apr_proc_mutex_t *mutex)
 {
     mutex->curr_locked = 0;
-    if (sem_post(mutex->psem_interproc) < 0) {
+    if (sem_post(mutex->os.psem_interproc) < 0) {
         /* any failure is probably fatal, so no big deal to leave
          * ->curr_locked at 0. */
         return errno;
     }
     return APR_SUCCESS;
 }
 
 static const apr_proc_mutex_unix_lock_methods_t mutex_posixsem_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_posix_tryacquire,
+#if defined(HAVE_SEM_TIMEDWAIT)
+    proc_mutex_posix_timedacquire,
+#else
+    proc_mutex_spinsleep_timedacquire,
+#endif
     proc_mutex_posix_release,
     proc_mutex_posix_cleanup,
     proc_mutex_no_child_init,
+    proc_mutex_no_perms_set,
+    APR_LOCK_POSIXSEM,
     "posixsem"
 };
 
 #endif /* Posix sem implementation */
 
 #if APR_HAS_SYSVSEM_SERIALIZE
 
 static struct sembuf proc_mutex_op_on;
 static struct sembuf proc_mutex_op_try;
 static struct sembuf proc_mutex_op_off;
 
 static void proc_mutex_sysv_setup(void)
 {
     proc_mutex_op_on.sem_num = 0;
     proc_mutex_op_on.sem_op = -1;
     proc_mutex_op_on.sem_flg = SEM_UNDO;
     proc_mutex_op_try.sem_num = 0;
     proc_mutex_op_try.sem_op = -1;
     proc_mutex_op_try.sem_flg = SEM_UNDO | IPC_NOWAIT;
     proc_mutex_op_off.sem_num = 0;
     proc_mutex_op_off.sem_op = 1;
     proc_mutex_op_off.sem_flg = SEM_UNDO;
 }
 
 static apr_status_t proc_mutex_sysv_cleanup(void *mutex_)
 {
     apr_proc_mutex_t *mutex=mutex_;
     union semun ick;
     
-    if (mutex->interproc->filedes != -1) {
+    if (mutex->os.crossproc != -1) {
         ick.val = 0;
-        semctl(mutex->interproc->filedes, 0, IPC_RMID, ick);
+        semctl(mutex->os.crossproc, 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) {
+    new_mutex->os.crossproc = semget(IPC_PRIVATE, 1, IPC_CREAT | 0600);
+    if (new_mutex->os.crossproc == -1) {
         rv = errno;
         proc_mutex_sysv_cleanup(new_mutex);
         return rv;
     }
     ick.val = 1;
-    if (semctl(new_mutex->interproc->filedes, 0, SETVAL, ick) < 0) {
+    if (semctl(new_mutex->os.crossproc, 0, SETVAL, ick) < 0) {
         rv = errno;
         proc_mutex_sysv_cleanup(new_mutex);
+        new_mutex->os.crossproc = -1;
         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);
+        rc = semop(mutex->os.crossproc, &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_tryacquire(apr_proc_mutex_t *mutex)
 {
     int rc;
 
     do {
-        rc = semop(mutex->interproc->filedes, &proc_mutex_op_try, 1);
+        rc = semop(mutex->os.crossproc, &proc_mutex_op_try, 1);
     } while (rc < 0 && errno == EINTR);
     if (rc < 0) {
         if (errno == EAGAIN) {
             return APR_EBUSY;
         }
         return errno;
     }
     mutex->curr_locked = 1;
     return APR_SUCCESS;
 }
 
+#if defined(HAVE_SEMTIMEDOP)
+static apr_status_t proc_mutex_sysv_timedacquire(apr_proc_mutex_t *mutex,
+                                             apr_interval_time_t timeout)
+{
+    if (timeout <= 0) {
+        apr_status_t rv = proc_mutex_sysv_tryacquire(mutex);
+        return (rv == APR_EBUSY) ? APR_TIMEUP : rv;
+    }
+    else {
+        int rc;
+        struct timespec reltime;
+
+        reltime.tv_sec = apr_time_sec(timeout);
+        reltime.tv_nsec = apr_time_usec(timeout) * 1000; /* nanoseconds */
+
+        do {
+            rc = semtimedop(mutex->os.crossproc, &proc_mutex_op_on, 1,
+                            &reltime);
+        } while (rc < 0 && errno == EINTR);
+        if (rc < 0) {
+            if (errno == EAGAIN) {
+                return APR_TIMEUP;
+            }
+            return errno;
+        }
+    }
+    mutex->curr_locked = 1;
+    return APR_SUCCESS;
+}
+#endif
+
 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);
+        rc = semop(mutex->os.crossproc, &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_perms_set(apr_proc_mutex_t *mutex,
+                                              apr_fileperms_t perms,
+                                              apr_uid_t uid,
+                                              apr_gid_t gid)
+{
+
+    union semun ick;
+    struct semid_ds buf;
+    buf.sem_perm.uid = uid;
+    buf.sem_perm.gid = gid;
+    buf.sem_perm.mode = apr_unix_perms2mode(perms);
+    ick.buf = &buf;
+    if (semctl(mutex->os.crossproc, 0, IPC_SET, ick) < 0) {
+        return errno;
+    }
+    return APR_SUCCESS;
+}
+
 static const apr_proc_mutex_unix_lock_methods_t mutex_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_sysv_tryacquire,
+#if defined(HAVE_SEMTIMEDOP)
+    proc_mutex_sysv_timedacquire,
+#else
+    proc_mutex_spinsleep_timedacquire,
+#endif
     proc_mutex_sysv_release,
     proc_mutex_sysv_cleanup,
     proc_mutex_no_child_init,
+    proc_mutex_sysv_perms_set,
+    APR_LOCK_SYSVSEM,
     "sysvsem"
 };
 
 #endif /* SysV sem implementation */
 
 #if APR_HAS_PROC_PTHREAD_SERIALIZE
 
-static apr_status_t proc_mutex_proc_pthread_cleanup(void *mutex_)
+#ifndef APR_USE_PROC_PTHREAD_MUTEX_COND
+#define APR_USE_PROC_PTHREAD_MUTEX_COND \
+            (defined(HAVE_PTHREAD_CONDATTR_SETPSHARED) \
+             && !defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK))
+#endif
+
+/* The mmap()ed pthread_interproc is the native pthread_mutex_t followed
+ * by a refcounter to track children using it.  We want to avoid calling
+ * pthread_mutex_destroy() on the shared mutex area while it is in use by
+ * another process, because this may mark the shared pthread_mutex_t as
+ * invalid for everyone, including forked children (unlike "sysvsem" for
+ * example), causing unexpected errors or deadlocks (PR 49504).  So the
+ * last process (parent or child) referencing the mutex will effectively
+ * destroy it.
+ */
+typedef struct {
+#define proc_pthread_cast(m) \
+    ((proc_pthread_mutex_t *)(m)->os.pthread_interproc)
+    pthread_mutex_t mutex;
+#define proc_pthread_mutex(m) \
+    (proc_pthread_cast(m)->mutex)
+#if APR_USE_PROC_PTHREAD_MUTEX_COND
+    pthread_cond_t  cond;
+#define proc_pthread_mutex_cond(m) \
+    (proc_pthread_cast(m)->cond)
+    apr_int32_t     cond_locked;
+#define proc_pthread_mutex_cond_locked(m) \
+    (proc_pthread_cast(m)->cond_locked)
+    apr_uint32_t    cond_num_waiters;
+#define proc_pthread_mutex_cond_num_waiters(m) \
+    (proc_pthread_cast(m)->cond_num_waiters)
+#define proc_pthread_mutex_is_cond(m) \
+    ((m)->pthread_refcounting && proc_pthread_mutex_cond_locked(m) != -1)
+#endif /* APR_USE_PROC_PTHREAD_MUTEX_COND */
+    apr_uint32_t refcount;
+#define proc_pthread_mutex_refcount(m) \
+    (proc_pthread_cast(m)->refcount)
+} proc_pthread_mutex_t;
+
+
+static APR_INLINE int proc_pthread_mutex_inc(apr_proc_mutex_t *mutex)
 {
+    if (mutex->pthread_refcounting) {
+        apr_atomic_inc32(&proc_pthread_mutex_refcount(mutex));
+        return 1;
+    }
+    return 0;
+}
+
+static APR_INLINE int proc_pthread_mutex_dec(apr_proc_mutex_t *mutex)
+{
+    if (mutex->pthread_refcounting) {
+        return apr_atomic_dec32(&proc_pthread_mutex_refcount(mutex));
+    }
+    return 0;
+}
+
+static apr_status_t proc_pthread_mutex_unref(void *mutex_)
+{
     apr_proc_mutex_t *mutex=mutex_;
     apr_status_t rv;
 
+#if APR_USE_PROC_PTHREAD_MUTEX_COND
+    if (proc_pthread_mutex_is_cond(mutex)) {
+        mutex->curr_locked = 0;
+    }
+    else
+#endif /* APR_USE_PROC_PTHREAD_MUTEX_COND */
     if (mutex->curr_locked == 1) {
-        if ((rv = pthread_mutex_unlock(mutex->pthread_interproc))) {
+        if ((rv = pthread_mutex_unlock(&proc_pthread_mutex(mutex)))) {
 #ifdef HAVE_ZOS_PTHREADS
             rv = errno;
 #endif
             return rv;
         }
     }
-    /* curr_locked is set to -1 until the mutex has been created */
-    if (mutex->curr_locked != -1) {
-        if ((rv = pthread_mutex_destroy(mutex->pthread_interproc))) {
+    if (!proc_pthread_mutex_dec(mutex)) {
+#if APR_USE_PROC_PTHREAD_MUTEX_COND
+        if (proc_pthread_mutex_is_cond(mutex) &&
+                (rv = pthread_cond_destroy(&proc_pthread_mutex_cond(mutex)))) {
 #ifdef HAVE_ZOS_PTHREADS
             rv = errno;
 #endif
             return rv;
         }
+#endif /* APR_USE_PROC_PTHREAD_MUTEX_COND */
+
+        if ((rv = pthread_mutex_destroy(&proc_pthread_mutex(mutex)))) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#endif
+            return rv;
+        }
     }
-    if (munmap((caddr_t)mutex->pthread_interproc, sizeof(pthread_mutex_t))) {
+    return APR_SUCCESS;
+}
+
+static apr_status_t proc_mutex_pthread_cleanup(void *mutex_)
+{
+    apr_proc_mutex_t *mutex=mutex_;
+    apr_status_t rv;
+
+    /* curr_locked is set to -1 until the mutex has been created */
+    if (mutex->curr_locked != -1) {
+        if ((rv = proc_pthread_mutex_unref(mutex))) {
+            return rv;
+        }
+    }
+    if (munmap(mutex->os.pthread_interproc, sizeof(proc_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)
+static apr_status_t proc_mutex_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) {
+    new_mutex->os.pthread_interproc = mmap(NULL, sizeof(proc_pthread_mutex_t),
+                                           PROT_READ | PROT_WRITE, MAP_SHARED,
+                                           fd, 0); 
+    if (new_mutex->os.pthread_interproc == MAP_FAILED) {
+        new_mutex->os.pthread_interproc = NULL;
+        rv = errno;
         close(fd);
-        return errno;
+        return rv;
     }
     close(fd);
 
+    new_mutex->pthread_refcounting = 1;
     new_mutex->curr_locked = -1; /* until the mutex has been created */
+#if APR_USE_PROC_PTHREAD_MUTEX_COND
+    proc_pthread_mutex_cond_locked(new_mutex) = -1;
+#endif
 
     if ((rv = pthread_mutexattr_init(&mattr))) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         return rv;
     }
     if ((rv = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED))) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         pthread_mutexattr_destroy(&mattr);
         return rv;
     }
 
+#if defined(HAVE_PTHREAD_MUTEX_ROBUST) || defined(HAVE_PTHREAD_MUTEX_ROBUST_NP)
 #ifdef HAVE_PTHREAD_MUTEX_ROBUST
-    if ((rv = pthread_mutexattr_setrobust_np(&mattr, 
-                                               PTHREAD_MUTEX_ROBUST_NP))) {
+    rv = pthread_mutexattr_setrobust(&mattr, PTHREAD_MUTEX_ROBUST);
+#else
+    rv = pthread_mutexattr_setrobust_np(&mattr, PTHREAD_MUTEX_ROBUST_NP);
+#endif
+    if (rv) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         pthread_mutexattr_destroy(&mattr);
         return rv;
     }
     if ((rv = pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT))) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         pthread_mutexattr_destroy(&mattr);
         return rv;
     }
-#endif /* HAVE_PTHREAD_MUTEX_ROBUST */
+#endif /* HAVE_PTHREAD_MUTEX_ROBUST[_NP] */
 
-    if ((rv = pthread_mutex_init(new_mutex->pthread_interproc, &mattr))) {
+    if ((rv = pthread_mutex_init(&proc_pthread_mutex(new_mutex), &mattr))) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         pthread_mutexattr_destroy(&mattr);
         return rv;
     }
 
+    proc_pthread_mutex_refcount(new_mutex) = 1; /* first/parent reference */
     new_mutex->curr_locked = 0; /* mutex created now */
 
     if ((rv = pthread_mutexattr_destroy(&mattr))) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
+        proc_mutex_pthread_cleanup(new_mutex);
         return rv;
     }
 
     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)
+static apr_status_t proc_mutex_pthread_child_init(apr_proc_mutex_t **mutex,
+                                                  apr_pool_t *pool, 
+                                                  const char *fname)
 {
+    (*mutex)->curr_locked = 0;
+    if (proc_pthread_mutex_inc(*mutex)) {
+        apr_pool_cleanup_register(pool, *mutex, proc_pthread_mutex_unref, 
+                                  apr_pool_cleanup_null);
+    }
+    return APR_SUCCESS;
+}
+
+static apr_status_t proc_mutex_pthread_acquire_ex(apr_proc_mutex_t *mutex,
+                                                  apr_interval_time_t timeout)
+{
     apr_status_t rv;
 
-    if ((rv = pthread_mutex_lock(mutex->pthread_interproc))) {
-#ifdef HAVE_ZOS_PTHREADS
-        rv = errno;
+#if APR_USE_PROC_PTHREAD_MUTEX_COND
+    if (proc_pthread_mutex_is_cond(mutex)) {
+        if ((rv = pthread_mutex_lock(&proc_pthread_mutex(mutex)))) {
+#ifdef HAVE_ZOS_PTHREADS 
+            rv = errno;
 #endif
+#if defined(HAVE_PTHREAD_MUTEX_ROBUST) || defined(HAVE_PTHREAD_MUTEX_ROBUST_NP)
+            /* Okay, our owner died.  Let's try to make it consistent again. */
+            if (rv == EOWNERDEAD) {
+                proc_pthread_mutex_dec(mutex);
 #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);
+                pthread_mutex_consistent(&proc_pthread_mutex(mutex));
+#else
+                pthread_mutex_consistent_np(&proc_pthread_mutex(mutex));
+#endif
+            }
+            else
+#endif
+            return rv;
         }
-        else
+
+        if (!proc_pthread_mutex_cond_locked(mutex)) {
+            rv = APR_SUCCESS;
+        }
+        else if (!timeout) {
+            rv = APR_TIMEUP;
+        }
+        else {
+            struct timespec abstime;
+
+            if (timeout > 0) {
+                timeout += apr_time_now();
+                abstime.tv_sec = apr_time_sec(timeout);
+                abstime.tv_nsec = apr_time_usec(timeout) * 1000; /* nanoseconds */
+            }
+
+            proc_pthread_mutex_cond_num_waiters(mutex)++;
+            do {
+                if (timeout < 0) {
+                    rv = pthread_cond_wait(&proc_pthread_mutex_cond(mutex),
+                                           &proc_pthread_mutex(mutex));
+                    if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+                        rv = errno;
+#endif
+                        break;
+                    }
+                }
+                else {
+                    rv = pthread_cond_timedwait(&proc_pthread_mutex_cond(mutex),
+                                                &proc_pthread_mutex(mutex),
+                                                &abstime);
+                    if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+                        rv = errno;
+#endif
+                        if (rv == ETIMEDOUT) {
+                            rv = APR_TIMEUP;
+                        }
+                        break;
+                    }
+                }
+            } while (proc_pthread_mutex_cond_locked(mutex));
+            proc_pthread_mutex_cond_num_waiters(mutex)--;
+        }
+        if (rv != APR_SUCCESS) {
+            pthread_mutex_unlock(&proc_pthread_mutex(mutex));
             return rv;
+        }
+
+        proc_pthread_mutex_cond_locked(mutex) = 1;
+
+        rv = pthread_mutex_unlock(&proc_pthread_mutex(mutex));
+        if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#endif
+            return rv;
+        }
+    }
+    else
+#endif /* APR_USE_PROC_PTHREAD_MUTEX_COND */
+    {
+        if (timeout < 0) {
+            rv = pthread_mutex_lock(&proc_pthread_mutex(mutex));
+            if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+                rv = errno;
+#endif
+            }
+        }
+        else if (!timeout) {
+            rv = pthread_mutex_trylock(&proc_pthread_mutex(mutex));
+            if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+                rv = errno;
+#endif
+                if (rv == EBUSY) {
+                    return APR_TIMEUP;
+                }
+            }
+        }
+        else
+#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK)
+        {
+            struct timespec abstime;
+
+            timeout += apr_time_now();
+            abstime.tv_sec = apr_time_sec(timeout);
+            abstime.tv_nsec = apr_time_usec(timeout) * 1000; /* nanoseconds */
+
+            rv = pthread_mutex_timedlock(&proc_pthread_mutex(mutex), &abstime);
+            if (rv) {
+#ifdef HAVE_ZOS_PTHREADS 
+                rv = errno;
+#endif
+                if (rv == ETIMEDOUT) {
+                    return APR_TIMEUP;
+                }
+            }
+        }
+        if (rv) {
+#if defined(HAVE_PTHREAD_MUTEX_ROBUST) || defined(HAVE_PTHREAD_MUTEX_ROBUST_NP)
+            /* Okay, our owner died.  Let's try to make it consistent again. */
+            if (rv == EOWNERDEAD) {
+                proc_pthread_mutex_dec(mutex);
+#ifdef HAVE_PTHREAD_MUTEX_ROBUST
+                pthread_mutex_consistent(&proc_pthread_mutex(mutex));
 #else
-        return rv;
+                pthread_mutex_consistent_np(&proc_pthread_mutex(mutex));
 #endif
+            }
+            else
+#endif
+            return rv;
+        }
+#else /* !HAVE_PTHREAD_MUTEX_TIMEDLOCK */
+        return proc_mutex_spinsleep_timedacquire(mutex, timeout);
+#endif
     }
+
     mutex->curr_locked = 1;
     return APR_SUCCESS;
 }
 
-static apr_status_t proc_mutex_proc_pthread_tryacquire(apr_proc_mutex_t *mutex)
+static apr_status_t proc_mutex_pthread_acquire(apr_proc_mutex_t *mutex)
 {
+    return proc_mutex_pthread_acquire_ex(mutex, -1);
+}
+
+static apr_status_t proc_mutex_pthread_tryacquire(apr_proc_mutex_t *mutex)
+{
+    apr_status_t rv = proc_mutex_pthread_acquire_ex(mutex, 0);
+    return (rv == APR_TIMEUP) ? APR_EBUSY : rv;
+}
+
+static apr_status_t proc_mutex_pthread_timedacquire(apr_proc_mutex_t *mutex,
+                                                apr_interval_time_t timeout)
+{
+    return proc_mutex_pthread_acquire_ex(mutex, (timeout <= 0) ? 0 : timeout);
+}
+
+static apr_status_t proc_mutex_pthread_release(apr_proc_mutex_t *mutex)
+{
     apr_status_t rv;
- 
-    if ((rv = pthread_mutex_trylock(mutex->pthread_interproc))) {
+
+#if APR_USE_PROC_PTHREAD_MUTEX_COND
+    if (proc_pthread_mutex_is_cond(mutex)) {
+        if ((rv = pthread_mutex_lock(&proc_pthread_mutex(mutex)))) {
 #ifdef HAVE_ZOS_PTHREADS 
-        rv = errno;
+            rv = errno;
 #endif
-        if (rv == EBUSY) {
-            return APR_EBUSY;
-        }
+#if defined(HAVE_PTHREAD_MUTEX_ROBUST) || defined(HAVE_PTHREAD_MUTEX_ROBUST_NP)
+            /* Okay, our owner died.  Let's try to make it consistent again. */
+            if (rv == EOWNERDEAD) {
+                proc_pthread_mutex_dec(mutex);
 #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);
+                pthread_mutex_consistent(&proc_pthread_mutex(mutex));
+#else
+                pthread_mutex_consistent_np(&proc_pthread_mutex(mutex));
+#endif
+            }
+            else
+#endif
+            return rv;
+        }
+
+        if (!proc_pthread_mutex_cond_locked(mutex)) {
+            rv = APR_EINVAL;
+        }
+        else if (!proc_pthread_mutex_cond_num_waiters(mutex)) {
             rv = APR_SUCCESS;
         }
-        else
+        else {
+            rv = pthread_cond_signal(&proc_pthread_mutex_cond(mutex));
+#ifdef HAVE_ZOS_PTHREADS
+            if (rv) {
+                rv = errno;
+            }
+#endif
+        }
+        if (rv != APR_SUCCESS) {
+            pthread_mutex_unlock(&proc_pthread_mutex(mutex));
             return rv;
-#else
-        return rv;
+        }
+
+        proc_pthread_mutex_cond_locked(mutex) = 0;
+    }
+#endif /* APR_USE_PROC_PTHREAD_MUTEX_COND */
+
+    mutex->curr_locked = 0;
+    if ((rv = pthread_mutex_unlock(&proc_pthread_mutex(mutex)))) {
+#ifdef HAVE_ZOS_PTHREADS
+        rv = errno;
 #endif
+        return rv;
     }
-    mutex->curr_locked = 1;
-    return rv;
+
+    return APR_SUCCESS;
 }
 
-static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex)
+static const apr_proc_mutex_unix_lock_methods_t mutex_proc_pthread_methods =
 {
+    APR_PROCESS_LOCK_MECH_IS_GLOBAL,
+    proc_mutex_pthread_create,
+    proc_mutex_pthread_acquire,
+    proc_mutex_pthread_tryacquire,
+    proc_mutex_pthread_timedacquire,
+    proc_mutex_pthread_release,
+    proc_mutex_pthread_cleanup,
+    proc_mutex_pthread_child_init,
+    proc_mutex_no_perms_set,
+    APR_LOCK_PROC_PTHREAD,
+    "pthread"
+};
+
+#if APR_USE_PROC_PTHREAD_MUTEX_COND
+static apr_status_t proc_mutex_pthread_cond_create(apr_proc_mutex_t *new_mutex,
+                                                   const char *fname)
+{
     apr_status_t rv;
+    pthread_condattr_t cattr;
 
-    mutex->curr_locked = 0;
-    if ((rv = pthread_mutex_unlock(mutex->pthread_interproc))) {
+    rv = proc_mutex_pthread_create(new_mutex, fname);
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    if ((rv = pthread_condattr_init(&cattr))) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
+        apr_pool_cleanup_run(new_mutex->pool, new_mutex,
+                             apr_proc_mutex_cleanup); 
         return rv;
     }
+    if ((rv = pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED))) {
+#ifdef HAVE_ZOS_PTHREADS
+        rv = errno;
+#endif
+        pthread_condattr_destroy(&cattr);
+        apr_pool_cleanup_run(new_mutex->pool, new_mutex,
+                             apr_proc_mutex_cleanup); 
+        return rv;
+    }
+    if ((rv = pthread_cond_init(&proc_pthread_mutex_cond(new_mutex),
+                                &cattr))) {
+#ifdef HAVE_ZOS_PTHREADS
+        rv = errno;
+#endif
+        pthread_condattr_destroy(&cattr);
+        apr_pool_cleanup_run(new_mutex->pool, new_mutex,
+                             apr_proc_mutex_cleanup); 
+        return rv;
+    }
+    pthread_condattr_destroy(&cattr);
+
+    proc_pthread_mutex_cond_locked(new_mutex) = 0;
+    proc_pthread_mutex_cond_num_waiters(new_mutex) = 0;
+
     return APR_SUCCESS;
 }
 
-static const apr_proc_mutex_unix_lock_methods_t mutex_proc_pthread_methods =
+static const apr_proc_mutex_unix_lock_methods_t mutex_proc_pthread_cond_methods =
 {
     APR_PROCESS_LOCK_MECH_IS_GLOBAL,
-    proc_mutex_proc_pthread_create,
-    proc_mutex_proc_pthread_acquire,
-    proc_mutex_proc_pthread_tryacquire,
-    proc_mutex_proc_pthread_release,
-    proc_mutex_proc_pthread_cleanup,
-    proc_mutex_no_child_init,
+    proc_mutex_pthread_cond_create,
+    proc_mutex_pthread_acquire,
+    proc_mutex_pthread_tryacquire,
+    proc_mutex_pthread_timedacquire,
+    proc_mutex_pthread_release,
+    proc_mutex_pthread_cleanup,
+    proc_mutex_pthread_child_init,
+    proc_mutex_no_perms_set,
+    APR_LOCK_PROC_PTHREAD,
     "pthread"
 };
+#endif
 
 #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_status_t status = APR_SUCCESS;
     apr_proc_mutex_t *mutex=mutex_;
 
     if (mutex->curr_locked == 1) {
         status = proc_mutex_fcntl_release(mutex);
         if (status != APR_SUCCESS)
             return status;
     }
         
-    return apr_file_close(mutex->interproc);
+    if (mutex->interproc) {
+        status = apr_file_close(mutex->interproc);
+    }
+    if (!mutex->interproc_closing
+            && mutex->os.crossproc != -1
+            && close(mutex->os.crossproc) == -1
+            && status == APR_SUCCESS) {
+        status = errno;
+    }
+    return status;
 }    
 
 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_FOPEN_CREATE | APR_FOPEN_WRITE | APR_FOPEN_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_FOPEN_CREATE | APR_FOPEN_WRITE | APR_FOPEN_EXCL,
                              new_mutex->pool);
     }
  
     if (rv != APR_SUCCESS) {
         return rv;
     }
 
+    new_mutex->os.crossproc = new_mutex->interproc->filedes;
+    new_mutex->interproc_closing = 1;
     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);
+        rc = fcntl(mutex->os.crossproc, 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_tryacquire(apr_proc_mutex_t *mutex)
 {
     int rc;
 
     do {
-        rc = fcntl(mutex->interproc->filedes, F_SETLK, &proc_mutex_lock_it);
+        rc = fcntl(mutex->os.crossproc, F_SETLK, &proc_mutex_lock_it);
     } while (rc < 0 && errno == EINTR);
     if (rc < 0) {
 #if FCNTL_TRYACQUIRE_EACCES
         if (errno == EACCES) {
 #else
         if (errno == EAGAIN) {
 #endif
             return APR_EBUSY;
         }
         return errno;
     }
     mutex->curr_locked = 1;
     return APR_SUCCESS;
 }
 
 static apr_status_t proc_mutex_fcntl_release(apr_proc_mutex_t *mutex)
 {
     int rc;
 
     mutex->curr_locked=0;
     do {
-        rc = fcntl(mutex->interproc->filedes, F_SETLKW, &proc_mutex_unlock_it);
+        rc = fcntl(mutex->os.crossproc, 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_perms_set(apr_proc_mutex_t *mutex,
+                                               apr_fileperms_t perms,
+                                               apr_uid_t uid,
+                                               apr_gid_t gid)
+{
+
+    if (mutex->fname) {
+        if (!(perms & APR_FPROT_GSETID))
+            gid = -1;
+        if (fchown(mutex->os.crossproc, uid, gid) < 0) {
+            return errno;
+        }
+    }
+    return APR_SUCCESS;
+}
+
 static const apr_proc_mutex_unix_lock_methods_t mutex_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_fcntl_tryacquire,
+    proc_mutex_spinsleep_timedacquire,
     proc_mutex_fcntl_release,
     proc_mutex_fcntl_cleanup,
     proc_mutex_no_child_init,
+    proc_mutex_fcntl_perms_set,
+    APR_LOCK_FCNTL,
     "fcntl"
 };
 
 #endif /* fcntl implementation */
 
 #if APR_HAS_FLOCK_SERIALIZE
 
 static apr_status_t proc_mutex_flock_release(apr_proc_mutex_t *);
 
 static apr_status_t proc_mutex_flock_cleanup(void *mutex_)
 {
-    apr_status_t status;
+    apr_status_t status = APR_SUCCESS;
     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);
+        status = apr_file_close(mutex->interproc);
     }
-    unlink(mutex->fname);
-    return APR_SUCCESS;
+    if (!mutex->interproc_closing
+            && mutex->os.crossproc != -1
+            && close(mutex->os.crossproc) == -1
+            && status == APR_SUCCESS) {
+        status = errno;
+    }
+    if (mutex->fname) {
+        unlink(mutex->fname);
+    }
+    return status;
 }    
 
 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_FOPEN_CREATE | APR_FOPEN_WRITE | APR_FOPEN_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_FOPEN_CREATE | APR_FOPEN_WRITE | APR_FOPEN_EXCL,
                              new_mutex->pool);
     }
  
     if (rv != APR_SUCCESS) {
         proc_mutex_flock_cleanup(new_mutex);
-        return errno;
+        return rv;
     }
+
+    new_mutex->os.crossproc = new_mutex->interproc->filedes;
+    new_mutex->interproc_closing = 1;
     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);
+        rc = flock(mutex->os.crossproc, 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_tryacquire(apr_proc_mutex_t *mutex)
 {
     int rc;
 
     do {
-        rc = flock(mutex->interproc->filedes, LOCK_EX | LOCK_NB);
+        rc = flock(mutex->os.crossproc, LOCK_EX | LOCK_NB);
     } while (rc < 0 && errno == EINTR);
     if (rc < 0) {
         if (errno == EWOULDBLOCK || errno == EAGAIN) {
             return APR_EBUSY;
         }
         return errno;
     }
     mutex->curr_locked = 1;
     return APR_SUCCESS;
 }
 
 static apr_status_t proc_mutex_flock_release(apr_proc_mutex_t *mutex)
 {
     int rc;
 
     mutex->curr_locked = 0;
     do {
-        rc = flock(mutex->interproc->filedes, LOCK_UN);
+        rc = flock(mutex->os.crossproc, 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;
+        if (!fname) {
+            return APR_SUCCESS;
+        }
     }
+
+    new_mutex = (apr_proc_mutex_t *)apr_pmemdup(pool, *mutex,
+                                                sizeof(apr_proc_mutex_t));
+    new_mutex->pool = pool;
     new_mutex->fname = apr_pstrdup(pool, fname);
     rv = apr_file_open(&new_mutex->interproc, new_mutex->fname,
                        APR_FOPEN_WRITE, 0, new_mutex->pool);
     if (rv != APR_SUCCESS) {
         return rv;
     }
+    new_mutex->os.crossproc = new_mutex->interproc->filedes;
+    new_mutex->interproc_closing = 1;
+
     *mutex = new_mutex;
     return APR_SUCCESS;
 }
 
+static apr_status_t proc_mutex_flock_perms_set(apr_proc_mutex_t *mutex,
+                                               apr_fileperms_t perms,
+                                               apr_uid_t uid,
+                                               apr_gid_t gid)
+{
+
+    if (mutex->fname) {
+        if (!(perms & APR_FPROT_GSETID))
+            gid = -1;
+        if (fchown(mutex->os.crossproc, uid, gid) < 0) {
+            return errno;
+        }
+    }
+    return APR_SUCCESS;
+}
+
 static const apr_proc_mutex_unix_lock_methods_t mutex_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_flock_tryacquire,
+    proc_mutex_spinsleep_timedacquire,
     proc_mutex_flock_release,
     proc_mutex_flock_cleanup,
     proc_mutex_flock_child_init,
+    proc_mutex_flock_perms_set,
+    APR_LOCK_FLOCK,
     "flock"
 };
 
 #endif /* flock implementation */
 
 void apr_proc_mutex_unix_setup_lock(void)
 {
     /* setup only needed for sysvsem and fnctl */
 #if APR_HAS_SYSVSEM_SERIALIZE
     proc_mutex_sysv_setup();
 #endif
 #if APR_HAS_FCNTL_SERIALIZE
     proc_mutex_fcntl_setup();
 #endif
 }
 
-static apr_status_t proc_mutex_choose_method(apr_proc_mutex_t *new_mutex, apr_lockmech_e mech)
+static apr_status_t proc_mutex_choose_method(apr_proc_mutex_t *new_mutex,
+                                             apr_lockmech_e mech,
+                                             apr_os_proc_mutex_t *ospmutex)
 {
+#if APR_HAS_PROC_PTHREAD_SERIALIZE
+    new_mutex->os.pthread_interproc = NULL;
+#endif
+#if APR_HAS_POSIXSEM_SERIALIZE
+    new_mutex->os.psem_interproc = NULL;
+#endif
+#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE
+    new_mutex->os.crossproc = -1;
+
+#if APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE
+    new_mutex->interproc = NULL;
+    new_mutex->interproc_closing = 0;
+#endif
+#endif
+
     switch (mech) {
     case APR_LOCK_FCNTL:
 #if APR_HAS_FCNTL_SERIALIZE
-        new_mutex->inter_meth = &mutex_fcntl_methods;
+        new_mutex->meth = &mutex_fcntl_methods;
+        if (ospmutex) {
+            if (ospmutex->crossproc == -1) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.crossproc = ospmutex->crossproc;
+        }
 #else
         return APR_ENOTIMPL;
 #endif
         break;
     case APR_LOCK_FLOCK:
 #if APR_HAS_FLOCK_SERIALIZE
-        new_mutex->inter_meth = &mutex_flock_methods;
+        new_mutex->meth = &mutex_flock_methods;
+        if (ospmutex) {
+            if (ospmutex->crossproc == -1) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.crossproc = ospmutex->crossproc;
+        }
 #else
         return APR_ENOTIMPL;
 #endif
         break;
     case APR_LOCK_SYSVSEM:
 #if APR_HAS_SYSVSEM_SERIALIZE
-        new_mutex->inter_meth = &mutex_sysv_methods;
+        new_mutex->meth = &mutex_sysv_methods;
+        if (ospmutex) {
+            if (ospmutex->crossproc == -1) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.crossproc = ospmutex->crossproc;
+        }
 #else
         return APR_ENOTIMPL;
 #endif
         break;
     case APR_LOCK_POSIXSEM:
 #if APR_HAS_POSIXSEM_SERIALIZE
-        new_mutex->inter_meth = &mutex_posixsem_methods;
+        new_mutex->meth = &mutex_posixsem_methods;
+        if (ospmutex) {
+            if (ospmutex->psem_interproc == NULL) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.psem_interproc = ospmutex->psem_interproc;
+        }
 #else
         return APR_ENOTIMPL;
 #endif
         break;
     case APR_LOCK_PROC_PTHREAD:
 #if APR_HAS_PROC_PTHREAD_SERIALIZE
-        new_mutex->inter_meth = &mutex_proc_pthread_methods;
+        new_mutex->meth = &mutex_proc_pthread_methods;
+        if (ospmutex) {
+            if (ospmutex->pthread_interproc == NULL) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.pthread_interproc = ospmutex->pthread_interproc;
+        }
 #else
         return APR_ENOTIMPL;
 #endif
         break;
+    case APR_LOCK_DEFAULT_TIMED:
+#if APR_HAS_PROC_PTHREAD_SERIALIZE \
+        && (APR_USE_PROC_PTHREAD_MUTEX_COND \
+            || defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK)) \
+        && defined(HAVE_PTHREAD_MUTEX_ROBUST)
+#if APR_USE_PROC_PTHREAD_MUTEX_COND
+        new_mutex->meth = &mutex_proc_pthread_cond_methods;
+#else
+        new_mutex->meth = &mutex_proc_pthread_methods;
+#endif
+        if (ospmutex) {
+            if (ospmutex->pthread_interproc == NULL) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.pthread_interproc = ospmutex->pthread_interproc;
+        }
+        break;
+#elif APR_HAS_SYSVSEM_SERIALIZE && defined(HAVE_SEMTIMEDOP)
+        new_mutex->meth = &mutex_sysv_methods;
+        if (ospmutex) {
+            if (ospmutex->crossproc == -1) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.crossproc = ospmutex->crossproc;
+        }
+        break;
+#elif APR_HAS_POSIXSEM_SERIALIZE && defined(HAVE_SEM_TIMEDWAIT)
+        new_mutex->meth = &mutex_posixsem_methods;
+        if (ospmutex) {
+            if (ospmutex->psem_interproc == NULL) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.psem_interproc = ospmutex->psem_interproc;
+        }
+        break;
+#endif
+        /* fall trough */
     case APR_LOCK_DEFAULT:
 #if APR_USE_FLOCK_SERIALIZE
-        new_mutex->inter_meth = &mutex_flock_methods;
+        new_mutex->meth = &mutex_flock_methods;
+        if (ospmutex) {
+            if (ospmutex->crossproc == -1) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.crossproc = ospmutex->crossproc;
+        }
 #elif APR_USE_SYSVSEM_SERIALIZE
-        new_mutex->inter_meth = &mutex_sysv_methods;
+        new_mutex->meth = &mutex_sysv_methods;
+        if (ospmutex) {
+            if (ospmutex->crossproc == -1) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.crossproc = ospmutex->crossproc;
+        }
 #elif APR_USE_FCNTL_SERIALIZE
-        new_mutex->inter_meth = &mutex_fcntl_methods;
+        new_mutex->meth = &mutex_fcntl_methods;
+        if (ospmutex) {
+            if (ospmutex->crossproc == -1) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.crossproc = ospmutex->crossproc;
+        }
 #elif APR_USE_PROC_PTHREAD_SERIALIZE
-        new_mutex->inter_meth = &mutex_proc_pthread_methods;
+        new_mutex->meth = &mutex_proc_pthread_methods;
+        if (ospmutex) {
+            if (ospmutex->pthread_interproc == NULL) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.pthread_interproc = ospmutex->pthread_interproc;
+        }
 #elif APR_USE_POSIXSEM_SERIALIZE
-        new_mutex->inter_meth = &mutex_posixsem_methods;
+        new_mutex->meth = &mutex_posixsem_methods;
+        if (ospmutex) {
+            if (ospmutex->psem_interproc == NULL) {
+                return APR_EINVAL;
+            }
+            new_mutex->os.psem_interproc = ospmutex->psem_interproc;
+        }
 #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) {
+    if ((rv = proc_mutex_choose_method(&mutex, APR_LOCK_DEFAULT,
+                                       NULL)) != 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) {
+    if ((rv = proc_mutex_choose_method(new_mutex, mech,
+                                       NULL)) != 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_pcalloc(pool, sizeof(apr_proc_mutex_t));
     new_mutex->pool = pool;
 
     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_timedlock(apr_proc_mutex_t *mutex,
+                                               apr_interval_time_t timeout)
+{
+#if APR_HAS_TIMEDLOCKS
+    return mutex->meth->timedacquire(mutex, timeout);
+#else
+    return APR_ENOTIMPL;
+#endif
+}
+
 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(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex)
+{
+    return mutex->meth->mech;
+}
+
 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 APR_HAS_FLOCK_SERIALIZE
     if (mutex->meth == &mutex_flock_methods) {
         return mutex->fname;
     }
 #endif
 #if APR_HAS_FCNTL_SERIALIZE
     if (mutex->meth == &mutex_fcntl_methods) {
         return mutex->fname;
     }
 #endif
     return NULL;
 }
 
+APR_PERMS_SET_IMPLEMENT(proc_mutex)
+{
+    apr_proc_mutex_t *mutex = (apr_proc_mutex_t *)theproc_mutex;
+    return mutex->meth->perms_set(mutex, perms, uid, gid);
+}
+
 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)
+APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex, 
+                                                   apr_proc_mutex_t *pmutex,
+                                                   apr_lockmech_e *mech)
 {
-#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE || APR_HAS_POSIXSEM_SERIALIZE
-    if (pmutex->interproc) {
-        ospmutex->crossproc = pmutex->interproc->filedes;
+    *ospmutex = pmutex->os;
+    if (mech) {
+        *mech = pmutex->meth->mech;
     }
-    else {
-        ospmutex->crossproc = -1;
-    }
-#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_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex,
+                                                apr_proc_mutex_t *pmutex)
+{
+    return apr_os_proc_mutex_get_ex(ospmutex, pmutex, NULL);
+}
+
+APR_DECLARE(apr_status_t) apr_os_proc_mutex_put_ex(apr_proc_mutex_t **pmutex,
                                                 apr_os_proc_mutex_t *ospmutex,
+                                                apr_lockmech_e mech,
+                                                int register_cleanup,
                                                 apr_pool_t *pool)
 {
+    apr_status_t rv;
     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);
+    rv = proc_mutex_choose_method(*pmutex, mech, ospmutex);
+#if APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE
+    if (rv == APR_SUCCESS) {
+        rv = apr_os_file_put(&(*pmutex)->interproc, &(*pmutex)->os.crossproc,
+                             0, pool);
+    }
 #endif
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-    (*pmutex)->pthread_interproc = ospmutex->pthread_interproc;
-#endif
-    return APR_SUCCESS;
+
+    if (rv == APR_SUCCESS && register_cleanup) {
+        apr_pool_cleanup_register(pool, *pmutex, apr_proc_mutex_cleanup, 
+                                  apr_pool_cleanup_null);
+    }
+    return rv;
+}
+
+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)
+{
+    return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT,
+                                    0, pool);
 }
 
Index: head/contrib/apr/locks/unix/thread_cond.c
===================================================================
--- head/contrib/apr/locks/unix/thread_cond.c	(revision 361677)
+++ head/contrib/apr/locks/unix/thread_cond.c	(revision 361678)
@@ -1,135 +1,145 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 HAVE_ZOS_PTHREADS
     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_palloc(pool, sizeof(apr_thread_cond_t));
 
     new_cond->pool = pool;
 
     if ((rv = pthread_cond_init(&new_cond->cond, NULL))) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         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 HAVE_ZOS_PTHREADS
     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;
+    if (timeout < 0) {
+        rv = pthread_cond_wait(&cond->cond, &mutex->mutex);
+#ifdef HAVE_ZOS_PTHREADS
+        if (rv) {
+            rv = errno;
+        }
+#endif
+    }
+    else {
+        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 */
+        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);
+        rv = pthread_cond_timedwait(&cond->cond, &mutex->mutex, &abstime);
 #ifdef HAVE_ZOS_PTHREADS
-    if (rv) {
-        rv = errno;
-    }
+        if (rv) {
+            rv = errno;
+        }
 #endif
-    if (ETIMEDOUT == rv) {
-        return APR_TIMEUP;
+        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 HAVE_ZOS_PTHREADS
     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 HAVE_ZOS_PTHREADS
     if (rv) {
         rv = errno;
     }
 #endif
     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)
 
 #endif /* APR_HAS_THREADS */
Index: head/contrib/apr/locks/unix/thread_mutex.c
===================================================================
--- head/contrib/apr/locks/unix/thread_mutex.c	(revision 361677)
+++ head/contrib/apr/locks/unix/thread_mutex.c	(revision 361678)
@@ -1,138 +1,334 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 HAVE_ZOS_PTHREADS
     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 HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         return rv;
     }
 
+#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+    if (flags & APR_THREAD_MUTEX_TIMED) {
+        rv = apr_thread_cond_create(&new_mutex->cond, pool);
+        if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#endif
+            pthread_mutex_destroy(&new_mutex->mutex);
+            return rv;
+        }
+    }
+#endif
+
     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;
 
+    if (mutex->cond) {
+        apr_status_t rv2;
+
+        rv = pthread_mutex_lock(&mutex->mutex);
+        if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#endif
+            return rv;
+        }
+
+        if (mutex->locked) {
+            mutex->num_waiters++;
+            rv = apr_thread_cond_wait(mutex->cond, mutex);
+            mutex->num_waiters--;
+        }
+        else {
+            mutex->locked = 1;
+        }
+
+        rv2 = pthread_mutex_unlock(&mutex->mutex);
+        if (rv2 && !rv) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#else
+            rv = rv2;
+#endif
+        }
+
+        return rv;
+    }
+
     rv = pthread_mutex_lock(&mutex->mutex);
 #ifdef HAVE_ZOS_PTHREADS
     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;
 
+    if (mutex->cond) {
+        apr_status_t rv2;
+
+        rv = pthread_mutex_lock(&mutex->mutex);
+        if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#endif
+            return rv;
+        }
+
+        if (mutex->locked) {
+            rv = APR_EBUSY;
+        }
+        else {
+            mutex->locked = 1;
+        }
+
+        rv2 = pthread_mutex_unlock(&mutex->mutex);
+        if (rv2) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#else
+            rv = rv2;
+#endif
+        }
+
+        return rv;
+    }
+
     rv = pthread_mutex_trylock(&mutex->mutex);
     if (rv) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         return (rv == EBUSY) ? APR_EBUSY : rv;
     }
 
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex,
+                                                 apr_interval_time_t timeout)
+{
+    apr_status_t rv = APR_ENOTIMPL;
+#if APR_HAS_TIMEDLOCKS
+
+#ifdef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+    if (timeout <= 0) {
+        rv = pthread_mutex_trylock(&mutex->mutex);
+        if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#endif
+            if (rv == EBUSY) {
+                rv = APR_TIMEUP;
+            }
+        }
+    }
+    else {
+        struct timespec abstime;
+
+        timeout += apr_time_now();
+        abstime.tv_sec = apr_time_sec(timeout);
+        abstime.tv_nsec = apr_time_usec(timeout) * 1000; /* nanoseconds */
+
+        rv = pthread_mutex_timedlock(&mutex->mutex, &abstime);
+        if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#endif
+            if (rv == ETIMEDOUT) {
+                rv = APR_TIMEUP;
+            }
+        }
+    }
+
+#else /* HAVE_PTHREAD_MUTEX_TIMEDLOCK */
+
+    if (mutex->cond) {
+        rv = pthread_mutex_lock(&mutex->mutex);
+        if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#endif
+            return rv;
+        }
+
+        if (mutex->locked) {
+            if (timeout <= 0) {
+                rv = APR_TIMEUP;
+            }
+            else {
+                mutex->num_waiters++;
+                do {
+                    rv = apr_thread_cond_timedwait(mutex->cond, mutex,
+                                                   timeout);
+                    if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+                        rv = errno;
+#endif
+                        break;
+                    }
+                } while (mutex->locked);
+                mutex->num_waiters--;
+            }
+            if (rv) {
+                pthread_mutex_unlock(&mutex->mutex);
+                return rv;
+            }
+        }
+
+        mutex->locked = 1;
+
+        rv = pthread_mutex_unlock(&mutex->mutex);
+        if (rv) {
+#ifdef HAVE_ZOS_PTHREADS
+            rv = errno;
+#endif
+            return rv;
+        }
+    }
+
+#endif /* HAVE_PTHREAD_MUTEX_TIMEDLOCK */
+
+#endif /* APR_HAS_TIMEDLOCKS */
+    return rv;
+}
+
 APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex)
 {
     apr_status_t status;
 
+    if (mutex->cond) {
+        status = pthread_mutex_lock(&mutex->mutex);
+        if (status) {
+#ifdef HAVE_ZOS_PTHREADS
+            status = errno;
+#endif
+            return status;
+        }
+
+        if (!mutex->locked) {
+            status = APR_EINVAL;
+        }
+        else if (mutex->num_waiters) {
+            status = apr_thread_cond_signal(mutex->cond);
+        }
+        if (status) {
+            pthread_mutex_unlock(&mutex->mutex);
+            return status;
+        }
+
+        mutex->locked = 0;
+    }
+
     status = pthread_mutex_unlock(&mutex->mutex);
 #ifdef HAVE_ZOS_PTHREADS
     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_status_t rv, rv2 = APR_SUCCESS;
+
+    if (mutex->cond) {
+        rv2 = apr_thread_cond_destroy(mutex->cond);
+    }
+    rv = apr_pool_cleanup_run(mutex->pool, mutex, thread_mutex_cleanup);
+    if (rv == APR_SUCCESS) {
+        rv = rv2;
+    }
+    
+    return rv;
 }
 
 APR_POOL_IMPLEMENT_ACCESSOR(thread_mutex)
 
 #endif /* APR_HAS_THREADS */
Index: head/contrib/apr/memory/unix/apr_pools.c
===================================================================
--- head/contrib/apr/memory/unix/apr_pools.c	(revision 361677)
+++ head/contrib/apr/memory/unix/apr_pools.c	(revision 361678)
@@ -1,2655 +1,2932 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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"
+#include "apr_support.h"
 #define APR_WANT_MEMFUNC
 #include "apr_want.h"
 #include "apr_env.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 and sysconf */
 #endif
 
+#if APR_ALLOCATOR_GUARD_PAGES && !APR_ALLOCATOR_USES_MMAP
+#define APR_ALLOCATOR_USES_MMAP   1
+#endif
+
 #if APR_ALLOCATOR_USES_MMAP
 #include <sys/mman.h>
 #endif
 
+#if HAVE_VALGRIND
+#include <valgrind.h>
+#include <memcheck.h>
+
+#define REDZONE APR_ALIGN_DEFAULT(8)
+int apr_running_on_valgrind = 0;
+#define APR_IF_VALGRIND(x)                                      \
+    do { if (apr_running_on_valgrind) { x; } } while (0)
+
+#else
+
+#define APR_IF_VALGRIND(x)
+
+#endif /* HAVE_VALGRIND */
+
+#define APR_VALGRIND_NOACCESS(addr_, size_)                     \
+    APR_IF_VALGRIND(VALGRIND_MAKE_MEM_NOACCESS(addr_, size_))
+#define APR_VALGRIND_UNDEFINED(addr_, size_)                    \
+    APR_IF_VALGRIND(VALGRIND_MAKE_MEM_UNDEFINED(addr_, size_))
+
+
+#if APR_POOL_CONCURRENCY_CHECK && !APR_HAS_THREADS
+#error pool-concurrency-check does not make sense without threads
+#endif
+
 /*
  * Magic numbers
  */
 
 /*
  * XXX: This is not optimal when using --enable-allocator-uses-mmap on
  * XXX: machines with large pagesize, but currently the sink is assumed
  * XXX: to be index 0, so MIN_ALLOC must be at least two pages.
  */
 #define MIN_ALLOC (2 * BOUNDARY_SIZE)
 #define MAX_INDEX   20
 
 #if APR_ALLOCATOR_USES_MMAP && defined(_SC_PAGESIZE)
 static unsigned int boundary_index;
 static unsigned int boundary_size;
 #define BOUNDARY_INDEX  boundary_index
 #define BOUNDARY_SIZE   boundary_size
 #else
 #define BOUNDARY_INDEX 12
 #define BOUNDARY_SIZE (1 << BOUNDARY_INDEX)
 #endif
 
+#if APR_ALLOCATOR_GUARD_PAGES
+#if defined(_SC_PAGESIZE)
+#define GUARDPAGE_SIZE boundary_size
+#else
+#error Cannot determine page size
+#endif /* _SC_PAGESIZE */
+#else
+#define GUARDPAGE_SIZE 0
+#endif /* APR_ALLOCATOR_GUARD_PAGES */
+
 /* 
  * 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;
+    apr_size_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;
+    apr_size_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;
+    apr_size_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_size_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;
 #if APR_ALLOCATOR_USES_MMAP
-            munmap(node, (node->index+1) << BOUNDARY_INDEX);
+            munmap((char *)node - GUARDPAGE_SIZE,
+                   2 * GUARDPAGE_SIZE + ((node->index+1) << BOUNDARY_INDEX));
 #else
             free(node);
 #endif
         }
     }
 
     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 in_size)
 {
-    apr_uint32_t max_free_index;
-    apr_uint32_t size = (APR_UINT32_TRUNC_CAST)in_size;
+    apr_size_t max_free_index;
+    apr_size_t size = in_size;
 
 #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_size_t allocator_align(apr_size_t in_size)
+{
+    apr_size_t size = in_size;
+
+    /* Round up the block size to the next boundary, but always
+     * allocate at least a certain size (MIN_ALLOC).
+     */
+    size = APR_ALIGN(size + APR_MEMNODE_T_SIZE, BOUNDARY_SIZE);
+    if (size < in_size) {
+        return 0;
+    }
+    if (size < MIN_ALLOC) {
+        size = MIN_ALLOC;
+    }
+
+    return size;
+}
+
+APR_DECLARE(apr_size_t) apr_allocator_align(apr_allocator_t *allocator,
+                                            apr_size_t size)
+{
+    (void)allocator;
+    return allocator_align(size);
+}
+
+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 max_index;
+    apr_size_t max_index;
     apr_size_t size, i, index;
 
     /* 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) {
+    size = allocator_align(in_size);
+    if (!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;
     
     if (index > APR_UINT32_MAX) {
         return NULL;
     }
 
     /* 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);
+                while (*ref == NULL && max_index);
 
                 allocator->max_index = max_index;
             }
 
             allocator->current_free_index += node->index + 1;
             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;
+            goto have_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 + 1;
             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;
+            goto have_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 APR_ALLOCATOR_USES_MMAP
+#if APR_ALLOCATOR_GUARD_PAGES
+    if ((node = mmap(NULL, size + 2 * GUARDPAGE_SIZE, PROT_NONE,
+                     MAP_PRIVATE|MAP_ANON, -1, 0)) == MAP_FAILED)
+#elif APR_ALLOCATOR_USES_MMAP
     if ((node = mmap(NULL, size, PROT_READ|PROT_WRITE,
                      MAP_PRIVATE|MAP_ANON, -1, 0)) == MAP_FAILED)
 #else
     if ((node = malloc(size)) == NULL)
 #endif
         return NULL;
 
+#if APR_ALLOCATOR_GUARD_PAGES
+    node = (apr_memnode_t *)((char *)node + GUARDPAGE_SIZE);
+    if (mprotect(node, size, PROT_READ|PROT_WRITE) != 0) {
+        munmap((char *)node - GUARDPAGE_SIZE, size + 2 * GUARDPAGE_SIZE);
+        return NULL;
+    }
+#endif
+    node->index = index;
+    node->endp = (char *)node + size;
+
+have_node:
     node->next = NULL;
-    node->index = (APR_UINT32_TRUNC_CAST)index;
     node->first_avail = (char *)node + APR_MEMNODE_T_SIZE;
-    node->endp = (char *)node + size;
 
+    APR_VALGRIND_UNDEFINED(node->first_avail, size - APR_MEMNODE_T_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;
+    apr_size_t index, max_index;
+    apr_size_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;
 
+        APR_VALGRIND_NOACCESS((char *)node + APR_MEMNODE_T_SIZE,
+                              (node->index+1) << BOUNDARY_INDEX);
+
         if (max_free_index != APR_ALLOCATOR_MAX_FREE_UNLIMITED
             && index + 1 > 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.
+            /* Add the node to the appropriate 'size' bucket.  Adjust
+             * the max_index when appropriate.
              */
             if ((node->next = allocator->free[index]) == NULL
                 && index > max_index) {
                 max_index = index;
             }
             allocator->free[index] = node;
             if (current_free_index >= index + 1)
                 current_free_index -= index + 1;
             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 + 1)
                 current_free_index -= index + 1;
             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;
 #if APR_ALLOCATOR_USES_MMAP
-        munmap(node, (node->index+1) << BOUNDARY_INDEX);
+        munmap((char *)node - GUARDPAGE_SIZE,
+               2 * GUARDPAGE_SIZE + ((node->index+1) << BOUNDARY_INDEX));
 #else
         free(node);
 #endif
     }
 }
 
 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;
+    apr_size_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;
     cleanup_t            *free_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 */
     apr_pool_t           *joined; /* the caller has guaranteed that this pool
                                    * will survive as long as ->joined */
     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) */
     cleanup_t            *pre_cleanups;
+#if APR_POOL_CONCURRENCY_CHECK
+
+#define                   IDLE        0
+#define                   IN_USE      1
+#define                   DESTROYED   2
+    volatile apr_uint32_t in_use;
+    apr_os_thread_t       in_use_by;
+#endif /* APR_POOL_CONCURRENCY_CHECK */
 };
 
 #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 free_proc_chain(struct process_chain *procs);
 
 #if APR_POOL_DEBUG
 static void pool_destroy_debug(apr_pool_t *pool, const char *file_line);
 #endif
 
 #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 HAVE_VALGRIND
+    apr_running_on_valgrind = RUNNING_ON_VALGRIND;
+#endif
+
 #if APR_ALLOCATOR_USES_MMAP && defined(_SC_PAGESIZE)
     boundary_size = sysconf(_SC_PAGESIZE);
     boundary_index = 12;
     while ( (1 << boundary_index) < boundary_size)
         boundary_index++;
     boundary_size = (1 << boundary_index);
 #endif
 
     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().
      *
      * Warning: apr_atomic_init() must always be called, by any
      * means possible, from apr_initialize().
      */
     if ((rv = apr_atomic_init(global_pool)) != APR_SUCCESS) {
         return rv;
     }
 
 #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;
 }
 
 
 /* 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)
 
 /* Returns the amount of free space in the given node. */
 #define node_free_space(node_) ((apr_size_t)(node_->endp - node_->first_avail))
 
 /*
+ * Helpers to mark pool as in-use/free. Used for finding thread-unsafe
+ * concurrent accesses from different threads.
+ */
+#if APR_POOL_CONCURRENCY_CHECK
+
+static const char * const in_use_string[] = { "idle", "in use", "destroyed" };
+
+static void pool_concurrency_abort(apr_pool_t *pool, apr_uint32_t new, apr_uint32_t old)
+{
+    fprintf(stderr, "pool concurrency check: pool %p(%s), thread cur %lx "
+                    "in use by %lx, state %s -> %s \n",
+                    pool, pool->tag, (unsigned long)apr_os_thread_current(),
+                    (unsigned long)pool->in_use_by,
+                    in_use_string[old], in_use_string[new]);
+    abort();
+}
+
+static APR_INLINE void pool_concurrency_set_used(apr_pool_t *pool)
+{
+    apr_uint32_t old;
+
+    old = apr_atomic_cas32(&pool->in_use, IN_USE, IDLE);
+
+    if (old != IDLE)
+        pool_concurrency_abort(pool, IN_USE, old);
+
+    pool->in_use_by = apr_os_thread_current();
+}
+
+static APR_INLINE void pool_concurrency_set_idle(apr_pool_t *pool)
+{
+    apr_uint32_t old;
+
+    old = apr_atomic_cas32(&pool->in_use, IDLE, IN_USE);
+
+    if (old != IN_USE)
+        pool_concurrency_abort(pool, IDLE, old);
+}
+
+static APR_INLINE void pool_concurrency_init(apr_pool_t *pool)
+{
+    pool->in_use = IDLE;
+}
+
+static APR_INLINE void pool_concurrency_set_destroyed(apr_pool_t *pool)
+{
+    apr_uint32_t old;
+
+    old = apr_atomic_cas32(&pool->in_use, DESTROYED, IDLE);
+
+    if (old != IDLE)
+        pool_concurrency_abort(pool, DESTROYED, old);
+    pool->in_use_by = apr_os_thread_current();
+}
+#else
+static APR_INLINE void pool_concurrency_init(apr_pool_t *pool)          { }
+static APR_INLINE void pool_concurrency_set_used(apr_pool_t *pool)      { }
+static APR_INLINE void pool_concurrency_set_idle(apr_pool_t *pool)      { }
+static APR_INLINE void pool_concurrency_set_destroyed(apr_pool_t *pool) { }
+#endif /* APR_POOL_CONCURRENCY_CHECK */
+
+/*
  * Memory allocation
  */
 
 APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t in_size)
 {
     apr_memnode_t *active, *node;
     void *mem;
     apr_size_t size, free_index;
 
+    pool_concurrency_set_used(pool);
     size = APR_ALIGN_DEFAULT(in_size);
+#if HAVE_VALGRIND
+    if (apr_running_on_valgrind)
+        size += 2 * REDZONE;
+#endif
     if (size < in_size) {
+        pool_concurrency_set_idle(pool);
         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 <= node_free_space(active)) {
         mem = active->first_avail;
         active->first_avail += size;
-
-        return mem;
+        goto have_mem;
     }
 
     node = active->next;
     if (size <= node_free_space(node)) {
         list_remove(node);
     }
     else {
         if ((node = allocator_alloc(pool->allocator, size)) == NULL) {
+            pool_concurrency_set_idle(pool);
             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 = (APR_UINT32_TRUNC_CAST)free_index;
+    active->free_index = free_index;
     node = active->next;
     if (free_index >= node->free_index)
-        return mem;
+        goto have_mem;
 
     do {
         node = node->next;
     }
     while (free_index < node->free_index);
 
     list_remove(active);
     list_insert(active, node);
 
+have_mem:
+#if HAVE_VALGRIND
+    if (!apr_running_on_valgrind) {
+        pool_concurrency_set_idle(pool);
+        return mem;
+    }
+    else {
+        mem = (char *)mem + REDZONE;
+        VALGRIND_MEMPOOL_ALLOC(pool, mem, in_size);
+        pool_concurrency_set_idle(pool);
+        return mem;
+    }
+#else
+    pool_concurrency_set_idle(pool);
     return mem;
+#endif
 }
 
 /* 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;
 
     /* Run pre destroy cleanups */
     run_cleanups(&pool->pre_cleanups);
+
+    pool_concurrency_set_used(pool);
     pool->pre_cleanups = NULL;
+    pool_concurrency_set_idle(pool);
 
     /* 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_concurrency_set_used(pool);
     pool->cleanups = NULL;
     pool->free_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)
+    APR_IF_VALGRIND(VALGRIND_MEMPOOL_TRIM(pool, pool, 1));
+
+    if (active->next == active) {
+        pool_concurrency_set_idle(pool);
         return;
+    }
 
     *active->ref = NULL;
     allocator_free(pool->allocator, active->next);
     active->next = active;
     active->ref = &active->next;
+
+    pool_concurrency_set_idle(pool);
 }
 
 APR_DECLARE(void) apr_pool_destroy(apr_pool_t *pool)
 {
     apr_memnode_t *active;
     apr_allocator_t *allocator;
 
     /* Run pre destroy cleanups */
     run_cleanups(&pool->pre_cleanups);
+
+    pool_concurrency_set_used(pool);
     pool->pre_cleanups = NULL;
+    pool_concurrency_set_idle(pool);
 
     /* 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);
+    pool_concurrency_set_destroyed(pool);
 
     /* 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_IF_VALGRIND(VALGRIND_DESTROY_MEMPOOL(pool));
 }
 
 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;
 
     /* parent will always be non-NULL here except the first time a
      * pool is created, in which case allocator is guaranteed to be
      * non-NULL. */
 
     if (!abort_fn && parent)
         abort_fn = parent->abort_fn;
 
     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;
 
+#if HAVE_VALGRIND
+    if (!apr_running_on_valgrind) {
+        pool = (apr_pool_t *)node->first_avail;
+        pool->self_first_avail = (char *)pool + SIZEOF_POOL_T;
+    }
+    else {
+        pool = (apr_pool_t *)(node->first_avail + REDZONE);
+        pool->self_first_avail = (char *)pool + SIZEOF_POOL_T + 2 * REDZONE;
+        VALGRIND_MAKE_MEM_NOACCESS(pool->self_first_avail,
+                                   node->endp - pool->self_first_avail);
+        VALGRIND_CREATE_MEMPOOL(pool, REDZONE, 0);
+    }
+#else
     pool = (apr_pool_t *)node->first_avail;
-    node->first_avail = pool->self_first_avail = (char *)pool + SIZEOF_POOL_T;
+    pool->self_first_avail = (char *)pool + SIZEOF_POOL_T;
+#endif
+    node->first_avail = pool->self_first_avail;
 
     pool->allocator = allocator;
     pool->active = pool->self = node;
     pool->abort_fn = abort_fn;
     pool->child = NULL;
     pool->cleanups = NULL;
     pool->free_cleanups = NULL;
     pool->pre_cleanups = NULL;
     pool->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;
     }
 
+    pool_concurrency_init(pool);
+
     *newpool = pool;
 
     return APR_SUCCESS;
 }
 
 /* Deprecated. Renamed to apr_pool_create_unmanaged_ex
  */
 APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
                                                   apr_abortfunc_t abort_fn,
                                                   apr_allocator_t *allocator)
 {
     return apr_pool_create_unmanaged_ex(newpool, abort_fn, allocator);
 }
 
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged_ex(apr_pool_t **newpool,
                                                   apr_abortfunc_t abort_fn,
                                                   apr_allocator_t *allocator)
 {
     apr_pool_t *pool;
     apr_memnode_t *node;
     apr_allocator_t *pool_allocator;
 
     *newpool = NULL;
 
     if (!apr_pools_initialized)
         return APR_ENOPOOL;
     if ((pool_allocator = allocator) == NULL) {
         if ((pool_allocator = malloc(SIZEOF_ALLOCATOR_T)) == NULL) {
             if (abort_fn)
                 abort_fn(APR_ENOMEM);
 
             return APR_ENOMEM;
         }
         memset(pool_allocator, 0, SIZEOF_ALLOCATOR_T);
         pool_allocator->max_free_index = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
     }
     if ((node = allocator_alloc(pool_allocator,
                                 MIN_ALLOC - APR_MEMNODE_T_SIZE)) == NULL) {
         if (abort_fn)
             abort_fn(APR_ENOMEM);
 
         return APR_ENOMEM;
     }
 
     node->next = node;
     node->ref = &node->next;
 
     pool = (apr_pool_t *)node->first_avail;
     node->first_avail = pool->self_first_avail = (char *)pool + SIZEOF_POOL_T;
 
     pool->allocator = pool_allocator;
     pool->active = pool->self = node;
     pool->abort_fn = abort_fn;
     pool->child = NULL;
     pool->cleanups = NULL;
     pool->free_cleanups = NULL;
     pool->pre_cleanups = NULL;
     pool->subprocesses = NULL;
     pool->user_data = NULL;
     pool->tag = NULL;
     pool->parent = NULL;
     pool->sibling = NULL;
     pool->ref = NULL;
 
 #ifdef NETWARE
     pool->owner_proc = (apr_os_proc_t)getnlmhandle();
 #endif /* defined(NETWARE) */
     if (!allocator)
         pool_allocator->owner = pool;
+
+    pool_concurrency_init(pool);
     *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_size_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 <= node_free_space(node)) {
 
         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 = (APR_UINT32_TRUNC_CAST)free_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;
     }
 
+    APR_VALGRIND_UNDEFINED(node->first_avail,
+                           node->endp - node->first_avail);
     memcpy(node->first_avail, active->first_avail, cur_len);
+    APR_VALGRIND_NOACCESS(active->first_avail,
+                          active->endp - active->first_avail);
 
     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;
 }
 
+#if HAVE_VALGRIND
+static int add_redzone(int (*flush_func)(apr_vformatter_buff_t *b),
+                       struct psprintf_data *ps)
+{
+    apr_size_t len = ps->vbuff.curpos - ps->node->first_avail + REDZONE;
+
+    while (ps->vbuff.curpos - ps->node->first_avail < len) {
+        if (ps->vbuff.endpos - ps->node->first_avail >= len)
+            ps->vbuff.curpos = ps->node->first_avail + len;
+        else
+            ps->vbuff.curpos = ps->vbuff.endpos;
+
+        /*
+         * Prevent valgrind from complaining when psprintf_flush()
+         * does a memcpy(). The VALGRIND_MEMPOOL_ALLOC() will reset
+         * the redzone to NOACCESS.
+         */
+        if (ps->vbuff.curpos != ps->node->first_avail)
+            VALGRIND_MAKE_MEM_DEFINED(ps->node->first_avail,
+                                      ps->vbuff.curpos - ps->node->first_avail);
+        if (ps->vbuff.curpos == ps->vbuff.endpos) {
+            if (psprintf_flush(&ps->vbuff) == -1)
+                return -1;
+        }
+    }
+    return 0;
+}
+#endif
+
 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_size_t free_index;
 
+    pool_concurrency_set_used(pool);
     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)
-           goto error;
+            goto error;
     }
+#if HAVE_VALGRIND
+    if (apr_running_on_valgrind) {
+        if (add_redzone(psprintf_flush, &ps) == -1)
+            goto error;
+        if (!ps.got_a_new_node) {
+            /* psprintf_flush() has not been called, allow access to our node */
+            VALGRIND_MAKE_MEM_UNDEFINED(ps.vbuff.curpos,
+                                        ps.node->endp - ps.vbuff.curpos);
+        }
+    }
+#endif /* HAVE_VALGRIND */
 
     if (apr_vformatter(psprintf_flush, &ps.vbuff, fmt, ap) == -1)
         goto error;
 
-    strp = ps.vbuff.curpos;
-    *strp++ = '\0';
+    *ps.vbuff.curpos++ = '\0';
 
-    size = strp - ps.node->first_avail;
-    size = APR_ALIGN_DEFAULT(size);
+#if HAVE_VALGRIND
+    if (!apr_running_on_valgrind) {
+        strp = ps.node->first_avail;
+    }
+    else {
+        if (add_redzone(psprintf_flush, &ps) == -1)
+            goto error;
+        if (ps.node->endp != ps.vbuff.curpos)
+            APR_VALGRIND_NOACCESS(ps.vbuff.curpos,
+                                  ps.node->endp - ps.vbuff.curpos);
+        strp = ps.node->first_avail + REDZONE;
+        size = ps.vbuff.curpos - strp;
+        VALGRIND_MEMPOOL_ALLOC(pool, strp, size);
+        VALGRIND_MAKE_MEM_DEFINED(strp, size);
+    }
+#else
     strp = ps.node->first_avail;
+#endif
+
+    size = ps.vbuff.curpos - ps.node->first_avail;
+    size = APR_ALIGN_DEFAULT(size);
     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)
+    if (!ps.got_a_new_node) {
+        pool_concurrency_set_idle(pool);
         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 = (APR_UINT32_TRUNC_CAST)free_index;
+    active->free_index = free_index;
     node = active->next;
 
-    if (free_index >= node->free_index)
+    if (free_index >= node->free_index) {
+        pool_concurrency_set_idle(pool);
         return strp;
+    }
 
     do {
         node = node->next;
     }
     while (free_index < node->free_index);
 
     list_remove(active);
     list_insert(active, node);
 
+    pool_concurrency_set_idle(pool);
     return strp;
 
 error:
+    pool_concurrency_set_idle(pool);
     if (pool->abort_fn)
         pool->abort_fn(APR_ENOMEM);
     if (ps.got_a_new_node) {
         ps.node->next = ps.free;
         allocator_free(pool->allocator, ps.node);
     }
+    APR_VALGRIND_NOACCESS(pool->active->first_avail,
+                          pool->active->endp - pool->active->first_avail);
     return NULL;
 }
 
 
 #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%pp \"%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),
                 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%pp "
                 "<%s> "
                 "\n",
                 (unsigned long)getpid(),
 #if APR_HAS_THREADS
                 (unsigned long)apr_os_thread_current(),
 #endif /* APR_HAS_THREADS */
                 event,
                 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);
+                           __FILE__ ":apr_pool_integrity check [lifetime]", 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);
+                           __FILE__ ":apr_pool_integrity check [owner]", 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_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL)
     char *logpath;
     apr_file_t *debug_log = NULL;
 #endif
 
     if (apr_pools_initialized++)
         return APR_SUCCESS;
 
 #if APR_ALLOCATOR_USES_MMAP && defined(_SC_PAGESIZE)
     boundary_size = sysconf(_SC_PAGESIZE);
     boundary_index = 12;
     while ( (1 << boundary_index) < boundary_size)
         boundary_index++;
     boundary_size = (1 << boundary_index);
 #endif
 
     /* 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)
     rv = apr_env_get(&logpath, "APR_POOL_DEBUG_LOG", global_pool);
 
     /* Don't pass file_stderr directly to apr_file_open() here, since
      * apr_file_open() can call back to apr_pool_log_event() and that
      * may attempt to use then then non-NULL but partially set up file
      * object. */
     if (rv == APR_SUCCESS) {
         apr_file_open(&debug_log, logpath, APR_APPEND|APR_WRITE|APR_CREATE,
                       APR_OS_DEFAULT, global_pool);
     }
     else {
         apr_file_open_stderr(&debug_log, global_pool);
     }
 
     /* debug_log is now a file handle. */
     file_stderr = debug_log;
 
     if (file_stderr) {
         apr_file_printf(file_stderr,
             "POOL DEBUG: [PID"
 #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;
 
     if (--apr_pools_initialized)
         return;
 
     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) {
             free(mem);
             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;
+    apr_size_t index;
 
     /* Run pre destroy cleanups */
     run_cleanups(&pool->pre_cleanups);
     pool->pre_cleanups = NULL;
 
     /* Destroy the subpools.  The subpools will detach themselves from
      * this pool thus this loop is safe and easy.
      */
     while (pool->child)
         pool_destroy_debug(pool->child, file_line);
 
     /* Run cleanups */
     run_cleanups(&pool->cleanups);
     pool->free_cleanups = NULL;
     pool->cleanups = NULL;
 
     /* If new child pools showed up, this is a reason to raise a flag */
     if (pool->child)
         abort();
 
     /* 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,
                    (char *)node->endp[index] - (char *)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 */
 }
 
 static void 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(void) apr_pool_destroy_debug(apr_pool_t *pool,
                                          const char *file_line)
 {
     if (pool->joined) {
         /* Joined pools must not be explicitly destroyed; the caller
          * has broken the guarantee. */
 #if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL)
         apr_pool_log_event(pool, "LIFE",
                            __FILE__ ":apr_pool_destroy abort on joined", 0);
 #endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) */
 
         abort();
     }
     pool_destroy_debug(pool, file_line);
 }
 
 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 */
 #ifdef NETWARE
     pool->owner_proc = (apr_os_proc_t)getnlmhandle();
 #endif /* defined(NETWARE) */
 
 
     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;
 }
 
 APR_DECLARE(apr_status_t) apr_pool_create_core_ex_debug(apr_pool_t **newpool,
                                                    apr_abortfunc_t abort_fn,
                                                    apr_allocator_t *allocator,
                                                    const char *file_line)
 {
     return apr_pool_create_unmanaged_ex_debug(newpool, abort_fn, allocator,
                                               file_line);
 }
 
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged_ex_debug(apr_pool_t **newpool,
                                                    apr_abortfunc_t abort_fn,
                                                    apr_allocator_t *allocator,
                                                    const char *file_line)
 {
     apr_pool_t *pool;
     apr_allocator_t *pool_allocator;
 
     *newpool = NULL;
 
     if ((pool = malloc(SIZEOF_POOL_T)) == NULL) {
         if (abort_fn)
             abort_fn(APR_ENOMEM);
 
          return APR_ENOMEM;
     }
 
     memset(pool, 0, SIZEOF_POOL_T);
 
     pool->abort_fn = abort_fn;
     pool->tag = file_line;
     pool->file_line = file_line;
 
 #if APR_HAS_THREADS
     pool->owner = apr_os_thread_current();
 #endif /* APR_HAS_THREADS */
 #ifdef NETWARE
     pool->owner_proc = (apr_os_proc_t)getnlmhandle();
 #endif /* defined(NETWARE) */
 
     if ((pool_allocator = allocator) == NULL) {
         apr_status_t rv;
         if ((rv = apr_allocator_create(&pool_allocator)) != APR_SUCCESS) {
             if (abort_fn)
                 abort_fn(rv);
             return rv;
         }
         pool_allocator->owner = pool;
     }
     pool->allocator = pool_allocator;
 
     if (pool->allocator != allocator) {
 #if APR_HAS_THREADS
         apr_status_t rv;
 
         /* No matter what the creation flags say, always create
          * a lock.  Without it integrity_check and apr_pool_num_bytes
          * blow up (because they traverse pools child lists that
          * possibly belong to another thread, in combination with
          * the pool having no lock).  However, this might actually
          * hide problems like creating a child pool of a pool
          * belonging to another thread.
          */
         if ((rv = apr_thread_mutex_create(&pool->mutex,
                 APR_THREAD_MUTEX_NESTED, pool)) != APR_SUCCESS) {
             free(pool);
             return rv;
         }
 #endif /* APR_HAS_THREADS */
     }
 
     *newpool = pool;
 
 #if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE)
-    apr_pool_log_event(pool, "CREATE", file_line, 1);
+    apr_pool_log_event(pool, "CREATEU", 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)
 {
 #if APR_POOL_DEBUG
     if (sub->parent != p) {
         abort();
     }
     sub->joined = p;
 #endif
 }
 
 static int pool_find(apr_pool_t *pool, void *data)
 {
     void **pmem = (void **)data;
     debug_node_t *node;
-    apr_uint32_t index;
+    apr_size_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;
+    apr_size_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 */
 
 #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) */
 
 
 /*
  * "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 pool;
     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;
 
 #if APR_POOL_DEBUG
     /* Find the pool with the longest lifetime guaranteed by the
      * caller: */
     while (a->joined) {
         a = a->joined;
     }
 #endif
 
     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) {
         if (p->free_cleanups) {
             /* reuse a cleanup structure */
             c = p->free_cleanups;
             p->free_cleanups = c->next;
         } else {
             c = 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_pre_cleanup_register(apr_pool_t *p, const void *data,
                       apr_status_t (*plain_cleanup_fn)(void *data))
 {
     cleanup_t *c;
 
 #if APR_POOL_DEBUG
     apr_pool_check_integrity(p);
 #endif /* APR_POOL_DEBUG */
 
     if (p != NULL) {
         if (p->free_cleanups) {
             /* reuse a cleanup structure */
             c = p->free_cleanups;
             p->free_cleanups = c->next;
         } else {
             c = apr_palloc(p, sizeof(cleanup_t));
         }
         c->data = data;
         c->plain_cleanup_fn = plain_cleanup_fn;
         c->next = p->pre_cleanups;
         p->pre_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 APR_POOL_DEBUG
         /* Some cheap loop detection to catch a corrupt list: */
         if (c == c->next
             || (c->next && c == c->next->next)
             || (c->next && c->next->next && c == c->next->next->next)) {
             abort();
         }
 #endif
 
         if (c->data == data && c->plain_cleanup_fn == cleanup_fn) {
             *lastp = c->next;
             /* move to freelist */
             c->next = p->free_cleanups;
             p->free_cleanups = c;
             break;
         }
 
         lastp = &c->next;
         c = c->next;
     }
 
     /* Remove any pre-cleanup as well */
     c = p->pre_cleanups;
     lastp = &p->pre_cleanups;
     while (c) {
 #if APR_POOL_DEBUG
         /* Some cheap loop detection to catch a corrupt list: */
         if (c == c->next
             || (c->next && c == c->next->next)
             || (c->next && c->next->next && c == c->next->next->next)) {
             abort();
         }
 #endif
 
         if (c->data == data && c->plain_cleanup_fn == cleanup_fn) {
             *lastp = c->next;
             /* move to freelist */
             c->next = p->free_cleanups;
             p->free_cleanups = c;
             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;
     }
 }
 
 #if !defined(WIN32) && !defined(OS2)
 
 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)
 {
     cleanup_pool_for_exec(global_pool);
 }
 
 #else /* !defined(WIN32) && !defined(OS2) */
 
 APR_DECLARE(void) apr_pool_cleanup_for_exec(void)
 {
     /*
      * Don't need to do anything on NT or OS/2, because 
      * these platforms will spawn the new process - not
      * fork for exec. 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 that can be done about that (except if the
      * child decides to go out and close them, or the
      * developer quits opening them shared)
      */
     return;
 }
 
 #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);
 }
 
 APR_DECLARE(apr_status_t) apr_pool_create_core_ex_debug(apr_pool_t **newpool,
                                                    apr_abortfunc_t abort_fn,
                                                    apr_allocator_t *allocator,
                                                    const char *file_line)
 {
     return apr_pool_create_unmanaged_ex(newpool, abort_fn, allocator);
 }
 
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged_ex_debug(apr_pool_t **newpool,
                                                    apr_abortfunc_t abort_fn,
                                                    apr_allocator_t *allocator,
                                                    const char *file_line)
 {
     return apr_pool_create_unmanaged_ex(newpool, 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");
 }
 
 #undef apr_pool_create_core_ex
 APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
                                                   apr_abortfunc_t abort_fn,
                                                   apr_allocator_t *allocator);
 
 APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
                                                   apr_abortfunc_t abort_fn,
                                                   apr_allocator_t *allocator)
 {
     return apr_pool_create_unmanaged_ex_debug(newpool, abort_fn,
                                          allocator, "undefined");
 }
 
 #undef apr_pool_create_unmanaged_ex
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged_ex(apr_pool_t **newpool,
                                                   apr_abortfunc_t abort_fn,
                                                   apr_allocator_t *allocator);
 
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged_ex(apr_pool_t **newpool,
                                                   apr_abortfunc_t abort_fn,
                                                   apr_allocator_t *allocator)
 {
     return apr_pool_create_unmanaged_ex_debug(newpool, abort_fn,
                                          allocator, "undefined");
 }
 
 #endif /* APR_POOL_DEBUG */
Index: head/contrib/apr/misc/unix/errorcodes.c
===================================================================
--- head/contrib/apr/misc/unix/errorcodes.c	(revision 361677)
+++ head/contrib/apr/misc/unix/errorcodes.c	(revision 361678)
@@ -1,443 +1,443 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_ENOSTAT:
         return "Could not perform a stat on the file.";
     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_ESYMNOTFOUND:
         return "Could not find the requested symbol.";
     case APR_ENOTENOUGHENTROPY:
         return "Not enough entropy to continue.";
     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 is misformatted or contained invalid characters";
     case APR_EPATHWILD:
         return "The given path contained wildcard characters";
     case APR_EBUSY:
         return "The given lock was busy.";
     case APR_EPROC_UNKNOWN:
         return "The process is not recognized.";
     case APR_EGENERAL:
         return "Internal error (specific information not available)";
     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) && defined(USE_WINSOCK))
 
 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
 #ifndef _WIN32_WCE
     len = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM 
                       | FORMAT_MESSAGE_IGNORE_INSERTS,
                         NULL,
                         errcode,
                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
                         buf,
                         (DWORD)bufsize,
                         NULL);
 #else /* _WIN32_WCE speaks unicode */
      LPTSTR msg = (LPTSTR) buf;
      len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM 
                        | FORMAT_MESSAGE_IGNORE_INSERTS,
                          NULL,
                          errcode,
                          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
                          msg,
                          (DWORD) (bufsize/sizeof(TCHAR)),
                          NULL);
      /* in-place convert to US-ASCII, substituting '?' for non ASCII   */
      for(i = 0; i <= len; i++) {
         if (msg[i] < 0x80 && msg[i] >= 0) {
             buf[i] = (char) msg[i];
         } else {
             buf[i] = '?';
         }
     }
 #endif
 #endif
 
     if (!len) {
         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
+ * the prototype publicly (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);
     }
 }
 
Index: head/contrib/apr/misc/unix/rand.c
===================================================================
--- head/contrib/apr/misc/unix/rand.c	(revision 361677)
+++ head/contrib/apr/misc/unix/rand.c	(revision 361678)
@@ -1,250 +1,302 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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
 #if defined(HAVE_UUID_H)
 #include <uuid.h>
 #elif defined(HAVE_UUID_UUID_H)
 #include <uuid/uuid.h>
 #elif defined(HAVE_SYS_UUID_H)
 #include <sys/uuid.h>
 #endif
 
+#if defined(SYS_RANDOM)
+#if defined(HAVE_SYS_RANDOM_H) && \
+    defined(HAVE_GETRANDOM)
+
+#include <sys/random.h>
+#define USE_GETRANDOM
+
+#elif defined(HAVE_SYS_SYSCALL_H) && \
+      defined(HAVE_LINUX_RANDOM_H) && \
+      defined(HAVE_DECL_SYS_GETRANDOM) && \
+      HAVE_DECL_SYS_GETRANDOM
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <linux/random.h>
+#define getrandom(buf, buflen, flags) \
+    syscall(SYS_getrandom, (buf), (buflen), (flags))
+#define USE_GETRANDOM
+
+#endif /* HAVE_SYS_RANDOM_H */
+#endif /* SYS_RANDOM */
+
 #ifndef SHUT_RDWR
 #define SHUT_RDWR 2
 #endif
 
 #if APR_HAS_OS_UUID
 
 #if defined(HAVE_UUID_CREATE)
 
 APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data)
 {
     uint32_t rv;
     uuid_t g;
 
     uuid_create(&g, &rv);
 
     if (rv != uuid_s_ok)
         return APR_EGENERAL;
 
     memcpy(uuid_data, &g, sizeof(uuid_t));
 
     return APR_SUCCESS;
 }
 
 #elif defined(HAVE_UUID_GENERATE)
 
 APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data)
 {
     uuid_t g;
 
     uuid_generate(g);
 
     memcpy(uuid_data, g, sizeof(uuid_t));
 
     return APR_SUCCESS;
 }
 #endif 
 
 #endif /* APR_HAS_OS_UUID */
 
 #if APR_HAS_RANDOM
 
 APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char *buf, 
                                                     apr_size_t length)
 {
-#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;
-        
-        do {
-            rc = read(fd, buf, length);
-        } while (rc == -1 && errno == EINTR);
-
-        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)
+#if 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(SYS_RANDOM) && defined(USE_GETRANDOM)
+
+    do {
+        int rc;
+
+        rc = getrandom(buf, length, 0);
+        if (rc == -1) {
+            if (errno == EINTR) {
+                continue;
+            }
+            return errno;
+        }
+
+        buf += rc;
+        length -= rc;
+    } while (length > 0);
+
+#elif defined(SYS_RANDOM) && defined(HAVE_ARC4RANDOM_BUF)
+
+    arc4random_buf(buf, length);
+
+#elif defined(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;
+        
+        do {
+            rc = read(fd, buf, length);
+        } while (rc == -1 && errno == EINTR);
+
+        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_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();
+
+#else
+
+#error APR_HAS_RANDOM defined with no implementation
 
 #endif	/* DEV_RANDOM */
 
     return APR_SUCCESS;
 }
 
 #undef	STR
 #undef	XSTR
 
 #ifdef OS2
 #include "randbyte_os2.inc"
 #endif
 
 #endif /* APR_HAS_RANDOM */
Index: head/contrib/apr/network_io/unix/multicast.c
===================================================================
--- head/contrib/apr/network_io/unix/multicast.c	(revision 361677)
+++ head/contrib/apr/network_io/unix/multicast.c	(revision 361678)
@@ -1,313 +1,313 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_support.h"
 #include "apr_portable.h"
 #include "apr_arch_inherit.h"
 
 #ifdef HAVE_GETIFADDRS
 #include <net/if.h>
 #include <ifaddrs.h>
 #endif
 
 #ifdef HAVE_STRUCT_IPMREQ
 static void fill_mip_v4(struct ip_mreq *mip, apr_sockaddr_t *mcast,
                         apr_sockaddr_t *iface)
 {
     mip->imr_multiaddr = mcast->sa.sin.sin_addr;
     if (iface == NULL) {
         mip->imr_interface.s_addr = INADDR_ANY;
     }
     else {
         mip->imr_interface = iface->sa.sin.sin_addr;
     }
 }
 
 /* This function is only interested in AF_INET6 sockets, so a noop
  * "return 0" implementation for the !APR_HAVE_IPV6 build is
  * sufficient. */
 static unsigned int find_if_index(const apr_sockaddr_t *iface)
 {
     unsigned int index = 0;
 #if defined(HAVE_GETIFADDRS) && APR_HAVE_IPV6 
     struct ifaddrs *ifp, *ifs;
 
     /**
      * TODO: getifaddrs is only portable to *BSD and OS X. Using ioctl 
      *       and SIOCGIFCONF is needed for Linux/Solaris support.
      *       
      *       There is a wrapper that takes the messy ioctl interface into 
      *       getifaddrs. The license is acceptable, but, It is a fairly large 
      *       chunk of code.
      */
     if (getifaddrs(&ifs) != 0) {
         return 0;
     }
 
     for (ifp = ifs; ifp; ifp = ifp->ifa_next) {
         if (ifp->ifa_addr != NULL && ifp->ifa_addr->sa_family == AF_INET6) {
             if (memcmp(&iface->sa.sin6.sin6_addr,
-                       &ifp->ifa_addr->sa_data[0],
+                       &((struct sockaddr_in6*)ifp->ifa_addr)->sin6_addr,
                        sizeof(iface->sa.sin6.sin6_addr)) == 0) {
                 index = if_nametoindex(ifp->ifa_name);
                 break;
             }
         }
     }
 
     freeifaddrs(ifs);
 #endif
     return index;
 }
 
 #if APR_HAVE_IPV6
 static void fill_mip_v6(struct ipv6_mreq *mip, const apr_sockaddr_t *mcast,
                         const apr_sockaddr_t *iface)
 {
     memcpy(&mip->ipv6mr_multiaddr, mcast->ipaddr_ptr,
            sizeof(mip->ipv6mr_multiaddr));
 
     if (iface == NULL) {
         mip->ipv6mr_interface = 0;
     }
     else {
         mip->ipv6mr_interface = find_if_index(iface);
     }
 }
 
 #endif
 
 static int sock_is_ipv4(apr_socket_t *sock)
 {
     if (sock->local_addr->family == APR_INET)
         return 1;
     return 0;
 }
 
 #if APR_HAVE_IPV6
 static int sock_is_ipv6(apr_socket_t *sock)
 {
     if (sock->local_addr->family == APR_INET6)
         return 1;
     return 0;
 }
 #endif
 
 static apr_status_t do_mcast(int type, apr_socket_t *sock,
                              apr_sockaddr_t *mcast, apr_sockaddr_t *iface,
                              apr_sockaddr_t *source)
 {
     struct ip_mreq mip4;
     apr_status_t rv = APR_SUCCESS;
 #if APR_HAVE_IPV6
     struct ipv6_mreq mip6;
 #endif
 #ifdef GROUP_FILTER_SIZE
     struct group_source_req mip;
     int ip_proto;
 #endif
 
     if (source != NULL) {
 #ifdef GROUP_FILTER_SIZE
         if (sock_is_ipv4(sock)) {
             ip_proto = IPPROTO_IP;
         } 
 #if APR_HAVE_IPV6
         else if (sock_is_ipv6(sock)) {
             ip_proto = IPPROTO_IPV6;
         }
 #endif
         else {
             return APR_ENOTIMPL;
         }
 
         if (type == IP_ADD_MEMBERSHIP)
             type = MCAST_JOIN_SOURCE_GROUP;
         else if (type == IP_DROP_MEMBERSHIP)
             type = MCAST_LEAVE_SOURCE_GROUP;
         else
             return APR_ENOTIMPL;
 
         mip.gsr_interface = find_if_index(iface);
         memcpy(&mip.gsr_group, mcast->ipaddr_ptr, sizeof(mip.gsr_group));
         memcpy(&mip.gsr_source, source->ipaddr_ptr, sizeof(mip.gsr_source));
 
         if (setsockopt(sock->socketdes, ip_proto, type, (const void *) &mip,
                        sizeof(mip)) == -1) {
             rv = errno;
         }
 #else
         /* We do not support Source-Specific Multicast. */
         return APR_ENOTIMPL;
 #endif
     }
     else {
         if (sock_is_ipv4(sock)) {
 
             fill_mip_v4(&mip4, mcast, iface);
 
             if (setsockopt(sock->socketdes, IPPROTO_IP, type,
                            (const void *) &mip4, sizeof(mip4)) == -1) {
                 rv = errno;
             }
         }
 #if APR_HAVE_IPV6 && defined(IPV6_JOIN_GROUP) && defined(IPV6_LEAVE_GROUP)
         else if (sock_is_ipv6(sock)) {
             if (type == IP_ADD_MEMBERSHIP) {
                 type = IPV6_JOIN_GROUP;
             }
             else if (type == IP_DROP_MEMBERSHIP) {
                 type = IPV6_LEAVE_GROUP;
             }
             else {
                 return APR_ENOTIMPL;
             }
 
             fill_mip_v6(&mip6, mcast, iface);
 
             if (setsockopt(sock->socketdes, IPPROTO_IPV6, type,
                            (const void *) &mip6, sizeof(mip6)) == -1) {
                 rv = errno;
             }
         }
 #endif
         else {
             rv = APR_ENOTIMPL;
         }
     }
     return rv;
 }
 
 /* Set the IP_MULTICAST_TTL or IP_MULTICAST_LOOP option, or IPv6
  * equivalents, for the socket, to the given value.  Note that this
  * function *only works* for those particular option types. */
 static apr_status_t do_mcast_opt(int type, apr_socket_t *sock,
                                  apr_byte_t value)
 {
     apr_status_t rv = APR_SUCCESS;
 
     if (sock_is_ipv4(sock)) {
         /* For the IP_MULTICAST_* options, this must be a (char *)
          * pointer. */
         if (setsockopt(sock->socketdes, IPPROTO_IP, type,
                        (const void *) &value, sizeof(value)) == -1) {
             rv = errno;
         }
     }
 #if APR_HAVE_IPV6
     else if (sock_is_ipv6(sock)) {
         /* For the IPV6_* options, an (int *) pointer must be used. */
         int ivalue = value;
 
         if (type == IP_MULTICAST_TTL) {
             type = IPV6_MULTICAST_HOPS;
         }
         else if (type == IP_MULTICAST_LOOP) {
             type = IPV6_MULTICAST_LOOP;
         }
         else {
             return APR_ENOTIMPL;
         }
 
         if (setsockopt(sock->socketdes, IPPROTO_IPV6, type,
                        (const void *) &ivalue, sizeof(ivalue)) == -1) {
             rv = errno;
         }
     }
 #endif
     else {
         rv = APR_ENOTIMPL;
     }
 
     return rv;
 }
 #endif
 
 APR_DECLARE(apr_status_t) apr_mcast_join(apr_socket_t *sock,
                                          apr_sockaddr_t *join,
                                          apr_sockaddr_t *iface,
                                          apr_sockaddr_t *source)
 {
 #if defined(IP_ADD_MEMBERSHIP) && defined(HAVE_STRUCT_IPMREQ)
     return do_mcast(IP_ADD_MEMBERSHIP, sock, join, iface, source);
 #else
     return APR_ENOTIMPL;
 #endif
 }
 
 APR_DECLARE(apr_status_t) apr_mcast_leave(apr_socket_t *sock,
                                           apr_sockaddr_t *addr,
                                           apr_sockaddr_t *iface,
                                           apr_sockaddr_t *source)
 {
 #if defined(IP_DROP_MEMBERSHIP) && defined(HAVE_STRUCT_IPMREQ)
     return do_mcast(IP_DROP_MEMBERSHIP, sock, addr, iface, source);
 #else
     return APR_ENOTIMPL;
 #endif
 }
 
 APR_DECLARE(apr_status_t) apr_mcast_hops(apr_socket_t *sock, apr_byte_t ttl)
 {
 #if defined(IP_MULTICAST_TTL) && defined(HAVE_STRUCT_IPMREQ)
     return do_mcast_opt(IP_MULTICAST_TTL, sock, ttl);
 #else
     return APR_ENOTIMPL;
 #endif
 }
 
 APR_DECLARE(apr_status_t) apr_mcast_loopback(apr_socket_t *sock,
                                              apr_byte_t opt)
 {
 #if defined(IP_MULTICAST_LOOP) && defined(HAVE_STRUCT_IPMREQ)
     return do_mcast_opt(IP_MULTICAST_LOOP, sock, opt);
 #else
     return APR_ENOTIMPL;
 #endif
 }
 
 APR_DECLARE(apr_status_t) apr_mcast_interface(apr_socket_t *sock,
                                               apr_sockaddr_t *iface)
 {
 #if defined(IP_MULTICAST_IF) && defined(HAVE_STRUCT_IPMREQ)
     apr_status_t rv = APR_SUCCESS;
 
     if (sock_is_ipv4(sock)) {
         if (setsockopt(sock->socketdes, IPPROTO_IP, IP_MULTICAST_IF,
                        (const void *) &iface->sa.sin.sin_addr,
                        sizeof(iface->sa.sin.sin_addr)) == -1) {
             rv = errno;
         }
     }
 #if APR_HAVE_IPV6
     else if (sock_is_ipv6(sock)) {
         unsigned int idx = find_if_index(iface);
         if (setsockopt(sock->socketdes, IPPROTO_IPV6, IPV6_MULTICAST_IF,
                        (const void *) &idx, sizeof(idx)) == -1) {
             rv = errno;
         }
     }
 #endif
     else {
         rv = APR_ENOTIMPL;
     }
     return rv;
 #else
     return APR_ENOTIMPL;
 #endif
 }
Index: head/contrib/apr/network_io/unix/sockaddr.c
===================================================================
--- head/contrib/apr/network_io/unix/sockaddr.c	(revision 361677)
+++ head/contrib/apr/network_io/unix/sockaddr.c	(revision 361678)
@@ -1,1112 +1,1284 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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
 
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+
+#if defined(HAVE_IF_INDEXTONAME) && defined(_MSC_VER)
+#include "arch/win32/apr_arch_misc.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 _AIX
 /* Some levels of AIX getaddrinfo() don't like servname = "0", so
  * set servname to "1" when port is 0 and fix it up later.
  */
 #define AIX_SERVNAME_HACK 1
 #else
 #define AIX_SERVNAME_HACK 0
 #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_ip_getbuf(char *buf, apr_size_t buflen,
                                                  apr_sockaddr_t *sockaddr)
 {
     if (!apr_inet_ntop(sockaddr->family, sockaddr->ipaddr_ptr, buf, buflen)) {
         return APR_ENOSPC;
     }
 
 #if APR_HAVE_IPV6
     if (sockaddr->family == AF_INET6 
         && IN6_IS_ADDR_V4MAPPED((struct in6_addr *)sockaddr->ipaddr_ptr)
         && buflen > strlen("::ffff:")) {
         /* This is an IPv4-mapped IPv6 address; drop the leading
          * part of the address string so we're left with the familiar
          * IPv4 format.
          */
         memmove(buf, buf + strlen("::ffff:"),
                 strlen(buf + strlen("::ffff:"))+1);
     }
-#endif
+
     /* ensure NUL termination if the buffer is too short */
     buf[buflen-1] = '\0';
+
+#ifdef HAVE_IF_INDEXTONAME
+    /* Append scope name for link-local addresses. */
+    if (sockaddr->family == AF_INET6
+        && IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)sockaddr->ipaddr_ptr)) {
+        char scbuf[IF_NAMESIZE], *p = buf + strlen(buf);
+
+        if (if_indextoname(sockaddr->sa.sin6.sin6_scope_id, scbuf) == scbuf) {
+            /* Space check, need room for buf + '%' + scope + '\0'.
+             * Assert: buflen >= strlen(buf) + strlen(scbuf) + 2
+             * Equiv:  buflen >= (p-buf) + strlen(buf) + 2
+             * Thus, fail in inverse condition: */
+            if (buflen < strlen(scbuf) + (p - buf) + 2) {
+                return APR_ENOSPC;
+            }
+            *p++ = '%';
+            memcpy(p, scbuf, strlen(scbuf) + 1);
+        }
+    }    
+#endif /* HAVE_IF_INDEXTONAME */
+#endif /* APR_HAVE_IPV6 */
+
     return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_sockaddr_ip_get(char **addr,
                                               apr_sockaddr_t *sockaddr)
 {
     *addr = apr_palloc(sockaddr->pool, sockaddr->addr_str_len);
     return apr_sockaddr_ip_getbuf(*addr, sockaddr->addr_str_len, sockaddr);
 }
 
 void apr_sockaddr_vars_set(apr_sockaddr_t *addr, int family, apr_port_t port)
 {
     addr->family = family;
     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 AIX_SERVNAME_HACK
     else {
         addr->sa.sin.sin_port = htons(port);
     }
 #endif
 
     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
+#if APR_HAVE_SOCKADDR_UN
+    else if (family == APR_UNIX) {
+        addr->salen = sizeof(struct sockaddr_un);
+        addr->addr_str_len = sizeof(addr->sa.unx.sun_path);;
+        addr->ipaddr_ptr = &(addr->sa.unx.sun_path);
+        addr->ipaddr_len = addr->addr_str_len;
+    }
+#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';
+            *scope_id = apr_pstrmemdup(p, scope_delim + 1, end_bracket - scope_delim - 1);
         }
         else {
             addrlen = addrlen - 2; /* minus 2 for '[' and ']' */
         }
 
-        *addr = apr_palloc(p, addrlen + 1);
-        memcpy(*addr,
-               str + 1,
-               addrlen);
-        (*addr)[addrlen] = '\0';
+        *addr = apr_pstrmemdup(p, str + 1, addrlen);
         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';
+        *addr = apr_pstrmemdup(p, str, addrlen);
     }
     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;
 #ifdef HAVE_GAI_ADDRCONFIG
     if (family == APR_UNSPEC) {
         /* By default, only look up addresses using address types for
          * which a local interface is configured, i.e. no IPv6 if no
          * IPv6 interfaces configured. */
         hints.ai_flags = AI_ADDRCONFIG;
     }
 #endif
 
 #ifdef __MVS__
     /* z/OS will not return IPv4 address under AF_UNSPEC if any IPv6 results 
      * are returned, w/o AI_ALL. 
      */
     if (family == APR_UNSPEC) { 
        hints.ai_flags |= AI_ALL;
     }
 #endif
 
     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 OSF1
         /* The Tru64 5.0 getaddrinfo() can only resolve services given
          * by the name listed in /etc/services; a numeric or unknown
          * servname gets an EAI_SERVICE error.  So just resolve the
          * appropriate anyaddr and fill in the port later. */
         hostname = family == AF_INET6 ? "::" : "0.0.0.0";
         servname = NULL;
 #ifdef AI_NUMERICHOST
         hints.ai_flags |= AI_NUMERICHOST;
 #endif
 #else
 #if AIX_SERVNAME_HACK
         if (!port) {
             servname = "1";
         }
         else
 #endif /* AIX_SERVNAME_HACK */
         servname = apr_itoa(p, port);
 #endif /* OSF1 */
     }
     error = getaddrinfo(hostname, servname, &hints, &ai_list);
 #ifdef HAVE_GAI_ADDRCONFIG
     /*
      * Using AI_ADDRCONFIG involves some unfortunate guesswork because it
      * does not consider loopback addresses when trying to determine if
      * IPv4 or IPv6 is configured on a system (see RFC 3493).
      * This is a problem if one actually wants to listen on or connect to
      * the loopback address of a protocol family that is not otherwise
      * configured on the system. See PR 52709.
      * To work around some of the problems, retry without AI_ADDRCONFIG
      * in case of EAI_ADDRFAMILY.
      * XXX: apr_sockaddr_info_get() should really accept a flag to determine
      * XXX: if AI_ADDRCONFIG's guesswork is wanted and if the address is
      * XXX: to be used for listen() or connect().
      *
      * In case of EAI_BADFLAGS, AI_ADDRCONFIG is not supported.
      */
     if ((family == APR_UNSPEC) && (error == EAI_BADFLAGS
 #ifdef EAI_ADDRFAMILY
                                    || error == EAI_ADDRFAMILY
 #endif
                                                              )) {
         hints.ai_flags &= ~AI_ADDRCONFIG;
         error = getaddrinfo(hostname, servname, &hints, &ai_list);
     }
 #endif
     if (error) {
 #if defined(WIN32)
         return apr_get_netos_error();
 #else
         if (error == EAI_SYSTEM) {
             return errno ? errno : APR_EGENERAL;
         }
         else 
         {
             /* 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;
         }
 #endif /* WIN32 */
     }
 
     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 APR_UNSPEC+AI_PASSIVE
          * lookups. */
 #if APR_HAVE_IPV6
         if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) {
 #else
         if (ai->ai_family != AF_INET) {
 #endif
             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);
 
     if (prev_sa == NULL) {
         /*
          * getaddrinfo returned only useless entries and *sa is still empty.
          * This should be treated as an error.
          */
         return APR_EGENERAL;
     }
 
     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;
     }
 
     if (prev_sa == NULL) {
         /* this should not happen but no result should be treated as error */
         return APR_EGENERAL;
     }
 
     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 != APR_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 (family == APR_UNSPEC && hostname && *hostname == '/') {
+        family = APR_UNIX;
+    }
+    if (family == APR_UNIX) {
+#if APR_HAVE_SOCKADDR_UN
+        if (hostname && *hostname == '/') {
+            *sa = apr_pcalloc(p, sizeof(apr_sockaddr_t));
+            (*sa)->pool = p;
+            apr_cpystrn((*sa)->sa.unx.sun_path, hostname,
+                        sizeof((*sa)->sa.unx.sun_path));
+            (*sa)->hostname = apr_pstrdup(p, hostname);
+            (*sa)->family = APR_UNIX;
+            (*sa)->sa.unx.sun_family = APR_UNIX;
+            (*sa)->salen = sizeof(struct sockaddr_un);
+            (*sa)->addr_str_len = sizeof((*sa)->sa.unx.sun_path);
+            (*sa)->ipaddr_ptr = &((*sa)->sa.unx.sun_path);
+            (*sa)->ipaddr_len = (*sa)->addr_str_len;
+
+            return APR_SUCCESS;
+        }
+        else
+#endif
+        {
+            *sa = NULL;
+            return APR_ENOTIMPL;
+        }
+    }
 #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_sockaddr_info_copy(apr_sockaddr_t **dst,
+                                                 const apr_sockaddr_t *src,
+                                                 apr_pool_t *p)
+{
+    apr_sockaddr_t *d;
+    const apr_sockaddr_t *s;
+
+    for (*dst = d = NULL, s = src; s; s = s->next) {
+        if (!d) {
+            *dst = d = apr_pmemdup(p, s, sizeof *s);
+        }
+        else {
+            d = d->next = apr_pmemdup(p, s, sizeof *s);
+        }
+        if (s->hostname) {
+            if (s == src || s->hostname != src->hostname) {
+                d->hostname = apr_pstrdup(p, s->hostname);
+            }
+            else {
+                d->hostname = (*dst)->hostname;
+            }
+        }
+        if (s->servname) {
+            if (s == src || s->servname != src->servname) {
+                d->servname = apr_pstrdup(p, s->servname);
+            }
+            else {
+                d->servname = (*dst)->servname;
+            }
+        }
+        d->pool = p;
+        apr_sockaddr_vars_set(d, s->family, s->port);
+    }
+    return APR_SUCCESS;
+}
+
 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);
     }
+#if APR_HAVE_SOCKADDR_UN
+    else if (sockaddr->family == APR_UNIX) {
+        *hostname = sockaddr->hostname;
+        return APR_SUCCESS;
+    }
+#endif
     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)
 {
 #if APR_HAS_THREADS && !defined(GETSERVBYNAME_IS_THREAD_SAFE) && \
     defined(HAVE_GETSERVBYNAME_R) && \
     (defined(GETSERVBYNAME_R_GLIBC2) || defined(GETSERVBYNAME_R_SOLARIS) || \
      defined(GETSERVBYNAME_R_OSF1))
     struct servent se;
 #if defined(GETSERVBYNAME_R_OSF1)
     struct servent_data sed;
 
     memset(&sed, 0, sizeof(sed)); /* must zero fill before use */
 #else
 #if defined(GETSERVBYNAME_R_GLIBC2)
     struct servent *res;
 #endif
     char buf[1024];
 #endif
 #else
     struct servent *se;
 #endif
 
     if (servname == NULL)
         return APR_EINVAL;
 
 #if APR_HAS_THREADS && !defined(GETSERVBYNAME_IS_THREAD_SAFE) && \
     defined(HAVE_GETSERVBYNAME_R) && \
     (defined(GETSERVBYNAME_R_GLIBC2) || defined(GETSERVBYNAME_R_SOLARIS) || \
      defined(GETSERVBYNAME_R_OSF1))
 #if defined(GETSERVBYNAME_R_GLIBC2)
     if (getservbyname_r(servname, NULL,
                         &se, buf, sizeof(buf), &res) == 0 && res != NULL) {
         sockaddr->port = ntohs(res->s_port);
         sockaddr->servname = apr_pstrdup(sockaddr->pool, servname);
         sockaddr->sa.sin.sin_port = res->s_port;
         return APR_SUCCESS;
     }
 #elif defined(GETSERVBYNAME_R_SOLARIS)
     if (getservbyname_r(servname, NULL, &se, buf, sizeof(buf)) != NULL) {
         sockaddr->port = ntohs(se.s_port);
         sockaddr->servname = apr_pstrdup(sockaddr->pool, servname);
         sockaddr->sa.sin.sin_port = se.s_port;
         return APR_SUCCESS;
     }
 #elif defined(GETSERVBYNAME_R_OSF1)
     if (getservbyname_r(servname, NULL, &se, &sed) == 0) {
         sockaddr->port = ntohs(se.s_port);
         sockaddr->servname = apr_pstrdup(sockaddr->pool, servname);
         sockaddr->sa.sin.sin_port = se.s_port;
         return APR_SUCCESS;
     }
 #endif
 #else
     if ((se = getservbyname(servname, NULL)) != NULL){
         sockaddr->port = ntohs(se->s_port);
         sockaddr->servname = apr_pstrdup(sockaddr->pool, servname);
         sockaddr->sa.sin.sin_port = se->s_port;
         return APR_SUCCESS;
     }
 #endif
     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))
 
+#if APR_HAVE_IPV6
+#define SCOPE_OR_ZERO(sa_) ((sa_)->family != AF_INET6 ? 0 :   \
+                            ((sa_)->sa.sin6.sin6_scope_id))
+#else
+#define SCOPE_OR_ZERO(sa_) (0)
+#endif
+
 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)) {
+    if (addr1->ipaddr_len == addr2->ipaddr_len
+        && !memcmp(addr1->ipaddr_ptr, addr2->ipaddr_ptr, addr1->ipaddr_len)
+        && SCOPE_OR_ZERO(addr1) == SCOPE_OR_ZERO(addr2)) {
         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 */
 }
 
 APR_DECLARE(int) apr_sockaddr_is_wildcard(const apr_sockaddr_t *addr)
 {
     static const char inaddr_any[
 #if APR_HAVE_IPV6
         sizeof(struct in6_addr)
 #else
         sizeof(struct in_addr)
 #endif
     ] = {0};
 
     if (addr->ipaddr_ptr /* IP address initialized */
         && addr->ipaddr_len <= sizeof inaddr_any) { /* else bug elsewhere? */
         if (!memcmp(inaddr_any, addr->ipaddr_ptr, addr->ipaddr_len)) {
             return 1;
         }
 #if APR_HAVE_IPV6
     if (addr->family == AF_INET6
         && IN6_IS_ADDR_V4MAPPED((struct in6_addr *)addr->ipaddr_ptr)) {
         struct in_addr *v4 = (struct in_addr *)&((apr_uint32_t *)addr->ipaddr_ptr)[3];
 
         if (!memcmp(inaddr_any, v4, sizeof *v4)) {
             return 1;
         }
     }
 #endif
     }
     return 0;
 }
 
 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 (strlen(ipstr) == 0) {
+        return 0;
+    }
+    
     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->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 if (sa->family == AF_INET6 && ipsub->family == AF_INET6) {
         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 */
+}
+
+APR_DECLARE(apr_status_t) apr_sockaddr_zone_set(apr_sockaddr_t *sa,
+                                                const char *zone_id)
+{
+#if !APR_HAVE_IPV6 || !defined(HAVE_IF_NAMETOINDEX)
+    return APR_ENOTIMPL;
+#else
+    unsigned int idx;
+    
+    if (sa->family != APR_INET6
+        || !IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)sa->ipaddr_ptr)) {
+        return APR_EBADIP;
+    }
+
+    idx = if_nametoindex(zone_id);
+    if (idx) {
+        sa->sa.sin6.sin6_scope_id = idx;
+        return APR_SUCCESS;
+    }
+
+    if (errno != ENODEV) {
+        return errno;
+    }
+    else {
+        char *endptr;
+        apr_int64_t i = apr_strtoi64(zone_id, &endptr, 10);
+
+        if (*endptr != '\0' || errno || i < 1 || i > APR_INT16_MAX) {
+            return APR_EGENERAL;
+        }
+
+        sa->sa.sin6.sin6_scope_id = (unsigned int) i;
+        return APR_SUCCESS;
+    }
+#endif
+}
+
+APR_DECLARE(apr_status_t) apr_sockaddr_zone_get(const apr_sockaddr_t *sa,
+                                                const char **name,
+                                                apr_uint32_t *id,
+                                                apr_pool_t *p)
+{
+#if !APR_HAVE_IPV6 || !defined(HAVE_IF_INDEXTONAME)
+    return APR_ENOTIMPL;
+#else
+    if (sa->family != APR_INET6 || !sa->sa.sin6.sin6_scope_id) {
+        return APR_EBADIP;
+    }        
+
+    if (name) {
+        char *buf = apr_palloc(p, IF_NAMESIZE);
+        if (if_indextoname(sa->sa.sin6.sin6_scope_id, buf) == NULL)
+            return errno;
+        *name = buf;
+    }
+
+    if (id) *id = sa->sa.sin6.sin6_scope_id;
+    
+    return APR_SUCCESS;
+#endif
 }
Index: head/contrib/apr/network_io/unix/sockets.c
===================================================================
--- head/contrib/apr/network_io/unix/sockets.c	(revision 361677)
+++ head/contrib/apr/network_io/unix/sockets.c	(revision 361678)
@@ -1,521 +1,572 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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"
 
 #ifdef BEOS_R5
 #undef close
 #define close closesocket
 #endif /* BEOS_R5 */
 
-static char generic_inaddr_any[16] = {0}; /* big enough for IPv4 or IPv6 */
+#if APR_HAVE_SOCKADDR_UN
+#define GENERIC_INADDR_ANY_LEN  sizeof(struct sockaddr_un)
+#else
+#define GENERIC_INADDR_ANY_LEN  16
+#endif
 
+/* big enough for IPv4, IPv6 and optionaly sun_path */
+static char generic_inaddr_any[GENERIC_INADDR_ANY_LEN] = {0};
+
 static apr_status_t socket_cleanup(void *sock)
 {
     apr_socket_t *thesocket = sock;
     int sd = thesocket->socketdes;
 
+#if APR_HAVE_SOCKADDR_UN
+    if (thesocket->bound && thesocket->local_addr->family == APR_UNIX) {
+        /* XXX: Check for return values ? */
+        unlink(thesocket->local_addr->hostname);
+    }
+#endif        
     /* Set socket descriptor to -1 before close(), so that there is no
      * chance of returning an already closed FD from apr_os_sock_get().
      */
     thesocket->socketdes = -1;
 
     if (close(sd) == 0) {
         return APR_SUCCESS;
     }
     else {
         /* Restore, close() was not successful. */
         thesocket->socketdes = sd;
 
         return errno;
     }
 }
 
+static apr_status_t socket_child_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->options = 0;
 #if defined(BEOS) && !defined(BEOS_BONE)
     /* BeOS pre-BONE has TCP_NODELAY on by default and it can't be
      * switched off!
      */
     sock->options |= 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)->pool = p;
     (*new)->local_addr = (apr_sockaddr_t *)apr_pcalloc((*new)->pool,
                                                        sizeof(apr_sockaddr_t));
     (*new)->local_addr->pool = p;
     (*new)->remote_addr = (apr_sockaddr_t *)apr_pcalloc((*new)->pool,
                                                         sizeof(apr_sockaddr_t));
     (*new)->remote_addr->pool = p;
     (*new)->remote_addr_unknown = 1;
 #ifndef WAITIO_USES_POLL
     /* Create a pollset with room for one descriptor. */
     /* ### check return codes */
     (void) apr_pollset_create(&(*new)->pollset, 1, p, 0);
 #endif
 }
 
 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(apr_socket_t **new, int ofamily, int type,
                                int protocol, apr_pool_t *cont)
 {
     int family = ofamily, flags = 0;
+    int oprotocol = protocol;
 
 #ifdef HAVE_SOCK_CLOEXEC
     flags |= SOCK_CLOEXEC;
 #endif
 
     if (family == APR_UNSPEC) {
 #if APR_HAVE_IPV6
         family = APR_INET6;
 #else
         family = APR_INET;
 #endif
     }
-
+#if APR_HAVE_SOCKADDR_UN
+    if (family == APR_UNIX) {
+        protocol = 0;
+    }
+#endif
     alloc_socket(new, cont);
 
 #ifndef BEOS_R5
     (*new)->socketdes = socket(family, type|flags, protocol);
 #else
     /* For some reason BeOS R5 has an unconventional protocol numbering,
      * so we need to translate here. */
     switch (protocol) {
     case 0:
         (*new)->socketdes = socket(family, type|flags, 0);
         break;
     case APR_PROTO_TCP:
         (*new)->socketdes = socket(family, type|flags, IPPROTO_TCP);
         break;
     case APR_PROTO_UDP:
         (*new)->socketdes = socket(family, type|flags, IPPROTO_UDP);
         break;
     case APR_PROTO_SCTP:
     default:
         errno = EPROTONOSUPPORT;
         (*new)->socketdes = -1;
         break;
     }
 #endif /* BEOS_R5 */
 
 #if APR_HAVE_IPV6
     if ((*new)->socketdes < 0 && ofamily == APR_UNSPEC) {
         family = APR_INET;
         (*new)->socketdes = socket(family, type|flags, protocol);
     }
 #endif
 
     if ((*new)->socketdes < 0) {
         return errno;
     }
-    set_socket_vars(*new, family, type, protocol);
+    set_socket_vars(*new, family, type, oprotocol);
 
 #ifndef HAVE_SOCK_CLOEXEC
     {
         int flags;
         apr_status_t rv;
 
         if ((flags = fcntl((*new)->socketdes, F_GETFD)) == -1) {
             rv = errno;
             close((*new)->socketdes);
             (*new)->socketdes = -1;
             return rv;
         }
 
         flags |= FD_CLOEXEC;
         if (fcntl((*new)->socketdes, F_SETFD, flags) == -1) {
             rv = errno;
             close((*new)->socketdes);
             (*new)->socketdes = -1;
             return rv;
         }
     }
 #endif
 
     (*new)->timeout = -1;
     (*new)->inherit = 0;
     apr_pool_cleanup_register((*new)->pool, (void *)(*new), socket_cleanup,
-                              socket_cleanup);
+                              socket_child_cleanup);
 
     return APR_SUCCESS;
 } 
 
 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->pool, 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 APR_HAVE_SOCKADDR_UN
+        if (sock->local_addr->family == APR_UNIX) {
+            sock->bound = 1;
+            sock->local_port_unknown = 1;
+        }
+        else
+#endif
         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)
 {
     int s;
     apr_sockaddr_t sa;
 
     sa.salen = sizeof(sa.sa);
 
 #ifdef HAVE_ACCEPT4
     {
         int flags = SOCK_CLOEXEC;
 
 #if defined(SOCK_NONBLOCK) && APR_O_NONBLOCK_INHERITED
         /* With FreeBSD accept4() (avail in 10+), O_NONBLOCK is not inherited
          * (unlike Linux).  Mimic the accept() behavior here in a way that
          * may help other platforms.
          */
         if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) {
             flags |= SOCK_NONBLOCK;
         }
 #endif
         s = accept4(sock->socketdes, (struct sockaddr *)&sa.sa, &sa.salen, flags);
     }
 #else
     s = accept(sock->socketdes, (struct sockaddr *)&sa.sa, &sa.salen);
 #endif
 
     if (s < 0) {
         return errno;
     }
 #ifdef TPF
     if (s == 0) { 
         /* 0 is an invalid socket for TPF */
         return APR_EINTR;
     }
 #endif
     alloc_socket(new, connection_context);
 
     /* Set up socket variables -- note that it may be possible for
      * *new to be an AF_INET socket when sock is AF_INET6 in some
      * dual-stack configurations, so ensure that the remote_/local_addr
      * structures are adjusted for the family of the accepted
      * socket: */
     set_socket_vars(*new, sa.sa.sin.sin_family, SOCK_STREAM, sock->protocol);
 
 #ifndef HAVE_POLL
     (*new)->connected = 1;
 #endif
     (*new)->timeout = -1;
 
     (*new)->remote_addr_unknown = 0;
 
     (*new)->socketdes = s;
 
     /* Copy in peer's address. */
     (*new)->remote_addr->sa = sa.sa;
     (*new)->remote_addr->salen = sa.salen;
 
     *(*new)->local_addr = *sock->local_addr;
 
     /* The above assignment just overwrote the pool entry. Setting the local_addr 
        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
+#if APR_HAVE_SOCKADDR_UN
+    else if (sock->local_addr->sa.sin.sin_family == AF_UNIX) {
+        *(*new)->remote_addr = *sock->local_addr;
+        (*new)->local_addr->ipaddr_ptr = &((*new)->local_addr->sa.unx.sun_path);
+        (*new)->remote_addr->ipaddr_ptr = &((*new)->remote_addr->sa.unx.sun_path);
+    }
+    if (sock->local_addr->sa.sin.sin_family != AF_UNIX)
+#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, APR_TCP_NODELAY) == 1) {
         apr_set_option(*new, APR_TCP_NODELAY, 1);
     }
 #endif /* TCP_NODELAY_INHERITED */
 #if APR_O_NONBLOCK_INHERITED
     if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) {
         apr_set_option(*new, 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;
     }
 
 #ifndef HAVE_ACCEPT4
     {
         int flags;
         apr_status_t rv;
 
         if ((flags = fcntl((*new)->socketdes, F_GETFD)) == -1) {
             rv = errno;
             close((*new)->socketdes);
             (*new)->socketdes = -1;
             return rv;
         }
 
         flags |= FD_CLOEXEC;
         if (fcntl((*new)->socketdes, F_SETFD, flags) == -1) {
             rv = errno;
             close((*new)->socketdes);
             (*new)->socketdes = -1;
             return rv;
         }
     }
 #endif
 
     (*new)->inherit = 0;
     apr_pool_cleanup_register((*new)->pool, (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)
                    && (sock->timeout > 0)) {
         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 (memcmp(sa->ipaddr_ptr, generic_inaddr_any, sa->ipaddr_len)) {
         /* A real remote address was passed in.  If the unspecified
          * address was used, the actual remote addr will have to be
          * determined using getpeername() if required. */
         sock->remote_addr_unknown = 0;
 
         /* Copy the address structure details in. */
         sock->remote_addr->sa = sa->sa;
         sock->remote_addr->salen = sa->salen;
         /* Adjust ipaddr_ptr et al. */
         apr_sockaddr_vars_set(sock->remote_addr, sa->family, sa->port);
     }
 
     if (sock->local_addr->port == 0) {
         /* connect() got us an ephemeral port */
         sock->local_port_unknown = 1;
     }
+#if APR_HAVE_SOCKADDR_UN
+    if (sock->local_addr->sa.sin.sin_family == AF_UNIX) {
+        /* Assign connect address as local. */
+        sock->local_addr = sa;
+    }
+    else
+#endif
     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;
     }
 
     if (rc == -1 && errno != EISCONN) {
         return errno;
     }
 
 #ifndef HAVE_POLL
     sock->connected=1;
 #endif
     return APR_SUCCESS;
 }
 
 apr_status_t apr_socket_type_get(apr_socket_t *sock, int *type)
 {
     *type = sock->type;
     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->pool, sizeof(sock_userdata_t));
 
     new->key = apr_pstrdup(sock->pool, key);
     new->data = data;
     new->next = sock->userdata;
     sock->userdata = new;
 
     if (cleanup) {
         apr_pool_cleanup_register(sock->pool, 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);
     set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, os_sock_info->protocol);
     (*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)->pool, (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_POOL_IMPLEMENT_ACCESSOR(socket)
 
 APR_IMPLEMENT_INHERIT_SET(socket, inherit, pool, socket_cleanup)
 
 APR_IMPLEMENT_INHERIT_UNSET(socket, inherit, pool, socket_cleanup)
Index: head/contrib/apr/network_io/unix/sockopt.c
===================================================================
--- head/contrib/apr/network_io/unix/sockopt.c	(revision 361677)
+++ head/contrib/apr/network_io/unix/sockopt.c	(revision 361678)
@@ -1,430 +1,465 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 new timeout is non-negative and our old timeout was
      * negative, then we need to ensure that we are non-blocking.
      * Conversely, if our new timeout is negative and we had
      * non-negative 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, APR_SO_NONBLOCK) != 1) {
             if ((stat = sononblock(sock->socketdes)) != APR_SUCCESS) {
                 return stat;
             }
             apr_set_option(sock, APR_SO_NONBLOCK, 1);
         }
     } 
     else if (t < 0 && sock->timeout >= 0) {
         if (apr_is_option_set(sock, APR_SO_NONBLOCK) != 0) { 
             if ((stat = soblock(sock->socketdes)) != APR_SUCCESS) { 
                 return stat; 
             }
             apr_set_option(sock, APR_SO_NONBLOCK, 0);
         } 
     }
     /* must disable the incomplete read support if we disable
      * a timeout
      */
     if (t <= 0) {
         sock->options &= ~APR_INCOMPLETE_READ;
     }
     sock->timeout = t;
     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, APR_SO_KEEPALIVE)) {
             if (setsockopt(sock->socketdes, SOL_SOCKET, SO_KEEPALIVE, (void *)&one, sizeof(int)) == -1) {
                 return errno;
             }
             apr_set_option(sock, APR_SO_KEEPALIVE, on);
         }
 #else
         return APR_ENOTIMPL;
 #endif
         break;
     case APR_SO_DEBUG:
         if (on != apr_is_option_set(sock, APR_SO_DEBUG)) {
             if (setsockopt(sock->socketdes, SOL_SOCKET, SO_DEBUG, (void *)&one, sizeof(int)) == -1) {
                 return errno;
             }
             apr_set_option(sock, APR_SO_DEBUG, on);
         }
         break;
     case APR_SO_BROADCAST:
 #ifdef SO_BROADCAST
         if (on != apr_is_option_set(sock, APR_SO_BROADCAST)) {
             if (setsockopt(sock->socketdes, SOL_SOCKET, SO_BROADCAST, (void *)&one, sizeof(int)) == -1) {
                 return errno;
             }
             apr_set_option(sock, APR_SO_BROADCAST, on);
         }
 #else
         return APR_ENOTIMPL;
 #endif
         break;
     case APR_SO_REUSEADDR:
         if (on != apr_is_option_set(sock, APR_SO_REUSEADDR)) {
             if (setsockopt(sock->socketdes, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(int)) == -1) {
                 return errno;
             }
             apr_set_option(sock, 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, 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, APR_SO_NONBLOCK, on);
         }
         break;
     case APR_SO_LINGER:
 #ifdef SO_LINGER
         if (apr_is_option_set(sock, 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, APR_SO_LINGER, on);
         }
 #else
         return APR_ENOTIMPL;
 #endif
         break;
     case APR_TCP_DEFER_ACCEPT:
 #if defined(TCP_DEFER_ACCEPT)
         if (apr_is_option_set(sock, APR_TCP_DEFER_ACCEPT) != on) {
             int optlevel = IPPROTO_TCP;
             int optname = TCP_DEFER_ACCEPT;
 
             if (setsockopt(sock->socketdes, optlevel, optname, 
                            (void *)&on, sizeof(int)) == -1) {
                 return errno;
             }
             apr_set_option(sock, APR_TCP_DEFER_ACCEPT, on);
         }
 #else
         return APR_ENOTIMPL;
 #endif
         break;
     case APR_TCP_NODELAY:
 #if defined(TCP_NODELAY)
         if (apr_is_option_set(sock, 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, 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
         /* TCP_NODELAY and TCP_CORK are mutually exclusive on Linux
          * kernels < 2.6; on newer kernels they can be used together
          * and TCP_CORK takes preference, which is the desired
          * behaviour.  On older kernels, TCP_NODELAY must be toggled
          * to "off" whilst TCP_CORK is in effect. */
         if (apr_is_option_set(sock, APR_TCP_NOPUSH) != on) {
 #ifndef HAVE_TCP_NODELAY_WITH_CORK
             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... */
             if (apr_is_option_set(sock, APR_TCP_NODELAY) == 1 && on) {
                 /* Now toggle TCP_NODELAY to off, if TCP_CORK is being
                  * turned on: */
                 int tmpflag = 0;
                 if (setsockopt(sock->socketdes, optlevel, optname,
                                (void*)&tmpflag, sizeof(int)) == -1) {
                     return errno;
                 }
                 apr_set_option(sock, APR_RESET_NODELAY, 1);
                 apr_set_option(sock, APR_TCP_NODELAY, 0);
             } else if (on) {
                 apr_set_option(sock, APR_RESET_NODELAY, 0);
             }
 #endif /* HAVE_TCP_NODELAY_WITH_CORK */
 
             /* 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, APR_TCP_NOPUSH, on);
 #ifndef HAVE_TCP_NODELAY_WITH_CORK
             if (!on && apr_is_option_set(sock, APR_RESET_NODELAY)) {
                 /* Now, if TCP_CORK was just turned off, turn
                  * TCP_NODELAY back on again if it was earlier toggled
                  * to off: */
                 int tmpflag = 1;
                 if (setsockopt(sock->socketdes, optlevel, optname,
                                (void*)&tmpflag, sizeof(int)) == -1) {
                     return errno;
                 }
                 apr_set_option(sock, APR_RESET_NODELAY,0);
                 apr_set_option(sock, APR_TCP_NODELAY, 1);
             }
 #endif /* HAVE_TCP_NODELAY_WITH_CORK */
         }
 #else
         return APR_ENOTIMPL;
 #endif
         break;
     case APR_INCOMPLETE_READ:
         apr_set_option(sock, 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->options 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, APR_IPV6_V6ONLY, on);
 #else
         return APR_ENOTIMPL;
 #endif
         break;
+    case APR_SO_FREEBIND:
+#if defined(IP_FREEBIND)
+        if (setsockopt(sock->socketdes, SOL_IP, IP_FREEBIND,
+                       (void *)&one, sizeof(int)) == -1) {
+            return errno;
+        }
+        apr_set_option(sock, APR_SO_FREEBIND, on);
+#elif 0 /* defined(IP_BINDANY) ... */
+        /* TODO: insert FreeBSD support here, note family specific
+         * options, IP_BINDANY vs IPV6_BINDANY */
+#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) {
         default:
             *on = apr_is_option_set(sock, opt);
     }
     return APR_SUCCESS;
 }
 
 
 apr_status_t apr_socket_atmark(apr_socket_t *sock, int *atmark)
 {
 #ifndef BEOS_R5
     int oobmark;
 
     if (ioctl(sock->socketdes, SIOCATMARK, (void*) &oobmark) < 0)
         return apr_get_netos_error();
 
     *atmark = (oobmark != 0);
 
     return APR_SUCCESS;
 #else /* BEOS_R5 */
     return APR_ENOTIMPL;
 #endif
 }
 
 apr_status_t apr_gethostname(char *buf, apr_int32_t len, apr_pool_t *cont)
 {
 #ifdef BEOS_R5
     if (gethostname(buf, len) == 0) {
 #else
     if (gethostname(buf, len) != 0) {
 #endif  
         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 *nonconst_name, 
                                       char *nonconst_args)
 {
     /* these should have been const; act like they are */
     const char *name = nonconst_name;
     const char *args = nonconst_args;
 
     struct accept_filter_arg af;
     socklen_t optlen = sizeof(af);
 
     /* FreeBSD returns an error if the filter is already set; ignore
      * this call if we previously set it to the same value.
      */
     if ((getsockopt(sock->socketdes, SOL_SOCKET, SO_ACCEPTFILTER,
                     &af, &optlen)) == 0) {
         if (!strcmp(name, af.af_name) && !strcmp(args, af.af_arg)) {
             return APR_SUCCESS;
         }
     }
 
     /* Uhh, at least in FreeBSD 9 the fields are declared as arrays of
      * these lengths; did sizeof not work in some ancient release?
      *
      * FreeBSD kernel sets the last byte to a '\0'.
      */
     apr_cpystrn(af.af_name, name, 16);
     apr_cpystrn(af.af_arg, args, 256 - 16);
 
     if ((setsockopt(sock->socketdes, SOL_SOCKET, SO_ACCEPTFILTER,
           &af, sizeof(af))) < 0) {
         return errno;
     }
     return APR_SUCCESS;
 }
 #endif
+
+APR_PERMS_SET_IMPLEMENT(socket)
+{
+#if APR_HAVE_SOCKADDR_UN
+    apr_status_t rv = APR_SUCCESS;
+    apr_socket_t *socket = (apr_socket_t *)thesocket;
+
+    if (socket->local_addr->family == APR_UNIX) {
+        if (!(perms & APR_FPROT_GSETID))
+            gid = -1;
+        if (fchown(socket->socketdes, uid, gid) < 0) {
+            rv = errno;
+        }
+    }
+    else
+        rv = APR_EINVAL;
+    return rv;
+#else
+    return APR_ENOTIMPL;
+#endif
+}
Index: head/contrib/apr/poll/unix/epoll.c
===================================================================
--- head/contrib/apr/poll/unix/epoll.c	(revision 361677)
+++ head/contrib/apr/poll/unix/epoll.c	(revision 361678)
@@ -1,481 +1,490 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_file_io.h"
 #include "apr_arch_networkio.h"
 #include "apr_arch_poll_private.h"
 #include "apr_arch_inherit.h"
 
 #if defined(HAVE_EPOLL)
 
 static apr_int16_t get_epoll_event(apr_int16_t event)
 {
     apr_int16_t rv = 0;
 
     if (event & APR_POLLIN)
         rv |= EPOLLIN;
     if (event & APR_POLLPRI)
         rv |= EPOLLPRI;
     if (event & APR_POLLOUT)
         rv |= EPOLLOUT;
     /* APR_POLLNVAL is not handled by epoll.  EPOLLERR and EPOLLHUP are return-only */
 
     return rv;
 }
 
 static apr_int16_t get_epoll_revent(apr_int16_t event)
 {
     apr_int16_t rv = 0;
 
     if (event & EPOLLIN)
         rv |= APR_POLLIN;
     if (event & EPOLLPRI)
         rv |= APR_POLLPRI;
     if (event & EPOLLOUT)
         rv |= APR_POLLOUT;
     if (event & EPOLLERR)
         rv |= APR_POLLERR;
     if (event & EPOLLHUP)
         rv |= APR_POLLHUP;
     /* APR_POLLNVAL is not handled by epoll. */
 
     return rv;
 }
 
 struct apr_pollset_private_t
 {
     int epoll_fd;
     struct epoll_event *pollset;
     apr_pollfd_t *result_set;
 #if APR_HAS_THREADS
     /* A thread mutex to protect operations on the rings */
     apr_thread_mutex_t *ring_lock;
 #endif
     /* A ring containing all of the pollfd_t that are active */
     APR_RING_HEAD(pfd_query_ring_t, pfd_elem_t) query_ring;
     /* A ring of pollfd_t that have been used, and then _remove()'d */
     APR_RING_HEAD(pfd_free_ring_t, pfd_elem_t) free_ring;
     /* A ring of pollfd_t where rings that have been _remove()`ed but
         might still be inside a _poll() */
     APR_RING_HEAD(pfd_dead_ring_t, pfd_elem_t) dead_ring;
 };
 
 static apr_status_t impl_pollset_cleanup(apr_pollset_t *pollset)
 {
     close(pollset->p->epoll_fd);
     return APR_SUCCESS;
 }
 
 
 static apr_status_t impl_pollset_create(apr_pollset_t *pollset,
                                         apr_uint32_t size,
                                         apr_pool_t *p,
                                         apr_uint32_t flags)
 {
     apr_status_t rv;
     int fd;
 
 #ifdef HAVE_EPOLL_CREATE1
     fd = epoll_create1(EPOLL_CLOEXEC);
 #else
     fd = epoll_create(size);
 #endif
     if (fd < 0) {
         pollset->p = NULL;
         return apr_get_netos_error();
     }
 
 #ifndef HAVE_EPOLL_CREATE1
     {
         int fd_flags;
 
         if ((fd_flags = fcntl(fd, F_GETFD)) == -1) {
             rv = errno;
             close(fd);
             pollset->p = NULL;
             return rv;
         }
 
         fd_flags |= FD_CLOEXEC;
         if (fcntl(fd, F_SETFD, fd_flags) == -1) {
             rv = errno;
             close(fd);
             pollset->p = NULL;
             return rv;
         }
     }
 #endif
 
     pollset->p = apr_palloc(p, sizeof(apr_pollset_private_t));
 #if APR_HAS_THREADS
     if ((flags & APR_POLLSET_THREADSAFE) &&
         !(flags & APR_POLLSET_NOCOPY) &&
         ((rv = apr_thread_mutex_create(&pollset->p->ring_lock,
                                        APR_THREAD_MUTEX_DEFAULT,
                                        p)) != APR_SUCCESS)) {
         close(fd);
         pollset->p = NULL;
         return rv;
     }
 #else
     if (flags & APR_POLLSET_THREADSAFE) {
         close(fd);
         pollset->p = NULL;
         return APR_ENOTIMPL;
     }
 #endif
     pollset->p->epoll_fd = fd;
     pollset->p->pollset = apr_palloc(p, size * sizeof(struct epoll_event));
     pollset->p->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
 
     if (!(flags & APR_POLLSET_NOCOPY)) {
         APR_RING_INIT(&pollset->p->query_ring, pfd_elem_t, link);
         APR_RING_INIT(&pollset->p->free_ring, pfd_elem_t, link);
         APR_RING_INIT(&pollset->p->dead_ring, pfd_elem_t, link);
     }
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollset_add(apr_pollset_t *pollset,
                                      const apr_pollfd_t *descriptor)
 {
     struct epoll_event ev = {0};
-    int ret = -1;
+    int ret;
     pfd_elem_t *elem = NULL;
     apr_status_t rv = APR_SUCCESS;
 
     ev.events = get_epoll_event(descriptor->reqevents);
 
     if (pollset->flags & APR_POLLSET_NOCOPY) {
         ev.data.ptr = (void *)descriptor;
     }
     else {
         pollset_lock_rings();
 
         if (!APR_RING_EMPTY(&(pollset->p->free_ring), pfd_elem_t, link)) {
             elem = APR_RING_FIRST(&(pollset->p->free_ring));
             APR_RING_REMOVE(elem, link);
         }
         else {
             elem = (pfd_elem_t *) apr_palloc(pollset->pool, sizeof(pfd_elem_t));
             APR_RING_ELEM_INIT(elem, link);
         }
         elem->pfd = *descriptor;
         ev.data.ptr = elem;
     }
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         ret = epoll_ctl(pollset->p->epoll_fd, EPOLL_CTL_ADD,
                         descriptor->desc.s->socketdes, &ev);
     }
     else {
         ret = epoll_ctl(pollset->p->epoll_fd, EPOLL_CTL_ADD,
                         descriptor->desc.f->filedes, &ev);
     }
 
     if (0 != ret) {
         rv = apr_get_netos_error();
     }
 
     if (!(pollset->flags & APR_POLLSET_NOCOPY)) {
         if (rv != APR_SUCCESS) {
             APR_RING_INSERT_TAIL(&(pollset->p->free_ring), elem, pfd_elem_t, link);
         }
         else {
             APR_RING_INSERT_TAIL(&(pollset->p->query_ring), elem, pfd_elem_t, link);
         }
         pollset_unlock_rings();
     }
 
     return rv;
 }
 
 static apr_status_t impl_pollset_remove(apr_pollset_t *pollset,
                                         const apr_pollfd_t *descriptor)
 {
     pfd_elem_t *ep;
     apr_status_t rv = APR_SUCCESS;
     struct epoll_event ev = {0}; /* ignored, but must be passed with
                                   * kernel < 2.6.9
                                   */
-    int ret = -1;
+    int ret;
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         ret = epoll_ctl(pollset->p->epoll_fd, EPOLL_CTL_DEL,
                         descriptor->desc.s->socketdes, &ev);
     }
     else {
         ret = epoll_ctl(pollset->p->epoll_fd, EPOLL_CTL_DEL,
                         descriptor->desc.f->filedes, &ev);
     }
     if (ret < 0) {
         rv = APR_NOTFOUND;
     }
 
     if (!(pollset->flags & APR_POLLSET_NOCOPY)) {
         pollset_lock_rings();
 
         for (ep = APR_RING_FIRST(&(pollset->p->query_ring));
              ep != APR_RING_SENTINEL(&(pollset->p->query_ring),
                                      pfd_elem_t, link);
              ep = APR_RING_NEXT(ep, link)) {
                 
             if (descriptor->desc.s == ep->pfd.desc.s) {
                 APR_RING_REMOVE(ep, link);
                 APR_RING_INSERT_TAIL(&(pollset->p->dead_ring),
                                      ep, pfd_elem_t, link);
                 break;
             }
         }
 
         pollset_unlock_rings();
     }
 
     return rv;
 }
 
 static apr_status_t impl_pollset_poll(apr_pollset_t *pollset,
                                            apr_interval_time_t timeout,
                                            apr_int32_t *num,
                                            const apr_pollfd_t **descriptors)
 {
-    int ret, i, j;
+    int ret;
     apr_status_t rv = APR_SUCCESS;
-    apr_pollfd_t *fdptr;
 
+    *num = 0;
+
     if (timeout > 0) {
         timeout /= 1000;
     }
 
     ret = epoll_wait(pollset->p->epoll_fd, pollset->p->pollset, pollset->nalloc,
                      timeout);
-    (*num) = ret;
-
     if (ret < 0) {
         rv = apr_get_netos_error();
     }
     else if (ret == 0) {
         rv = APR_TIMEUP;
     }
     else {
+        int i, j;
+        const apr_pollfd_t *fdptr;
+
         for (i = 0, j = 0; i < ret; i++) {
             if (pollset->flags & APR_POLLSET_NOCOPY) {
                 fdptr = (apr_pollfd_t *)(pollset->p->pollset[i].data.ptr);
             }
             else {
                 fdptr = &(((pfd_elem_t *) (pollset->p->pollset[i].data.ptr))->pfd);
             }
             /* Check if the polled descriptor is our
              * wakeup pipe. In that case do not put it result set.
              */
             if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
                 fdptr->desc_type == APR_POLL_FILE &&
                 fdptr->desc.f == pollset->wakeup_pipe[0]) {
-                apr_pollset_drain_wakeup_pipe(pollset);
+                apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe);
                 rv = APR_EINTR;
             }
             else {
                 pollset->p->result_set[j] = *fdptr;
                 pollset->p->result_set[j].rtnevents =
                     get_epoll_revent(pollset->p->pollset[i].events);
                 j++;
             }
         }
         if (((*num) = j)) { /* any event besides wakeup pipe? */
             rv = APR_SUCCESS;
 
             if (descriptors) {
                 *descriptors = pollset->p->result_set;
             }
         }
     }
 
     if (!(pollset->flags & APR_POLLSET_NOCOPY)) {
         pollset_lock_rings();
 
         /* Shift all PFDs in the Dead Ring to the Free Ring */
         APR_RING_CONCAT(&(pollset->p->free_ring), &(pollset->p->dead_ring), pfd_elem_t, link);
 
         pollset_unlock_rings();
     }
 
     return rv;
 }
 
-static apr_pollset_provider_t impl = {
+static const apr_pollset_provider_t impl = {
     impl_pollset_create,
     impl_pollset_add,
     impl_pollset_remove,
     impl_pollset_poll,
     impl_pollset_cleanup,
     "epoll"
 };
 
-apr_pollset_provider_t *apr_pollset_provider_epoll = &impl;
+const apr_pollset_provider_t *const apr_pollset_provider_epoll = &impl;
 
-static apr_status_t cb_cleanup(void *p_)
+static apr_status_t impl_pollcb_cleanup(apr_pollcb_t *pollcb)
 {
-    apr_pollcb_t *pollcb = (apr_pollcb_t *) p_;
     close(pollcb->fd);
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollcb_create(apr_pollcb_t *pollcb,
                                        apr_uint32_t size,
                                        apr_pool_t *p,
                                        apr_uint32_t flags)
 {
     int fd;
     
 #ifdef HAVE_EPOLL_CREATE1
     fd = epoll_create1(EPOLL_CLOEXEC);
 #else
     fd = epoll_create(size);
 #endif
     
     if (fd < 0) {
         return apr_get_netos_error();
     }
 
 #ifndef HAVE_EPOLL_CREATE1
     {
         int fd_flags;
         apr_status_t rv;
 
         if ((fd_flags = fcntl(fd, F_GETFD)) == -1) {
             rv = errno;
             close(fd);
             pollcb->fd = -1;
             return rv;
         }
 
         fd_flags |= FD_CLOEXEC;
         if (fcntl(fd, F_SETFD, fd_flags) == -1) {
             rv = errno;
             close(fd);
             pollcb->fd = -1;
             return rv;
         }
     }
 #endif
     
     pollcb->fd = fd;
     pollcb->pollset.epoll = apr_palloc(p, size * sizeof(struct epoll_event));
-    apr_pool_cleanup_register(p, pollcb, cb_cleanup, apr_pool_cleanup_null);
 
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollcb_add(apr_pollcb_t *pollcb,
                                     apr_pollfd_t *descriptor)
 {
-    struct epoll_event ev;
+    struct epoll_event ev = { 0 };
     int ret;
     
     ev.events = get_epoll_event(descriptor->reqevents);
-    ev.data.ptr = (void *)descriptor;
+    ev.data.ptr = (void *) descriptor;
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         ret = epoll_ctl(pollcb->fd, EPOLL_CTL_ADD,
                         descriptor->desc.s->socketdes, &ev);
     }
     else {
         ret = epoll_ctl(pollcb->fd, EPOLL_CTL_ADD,
                         descriptor->desc.f->filedes, &ev);
     }
     
     if (ret == -1) {
         return apr_get_netos_error();
     }
     
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollcb_remove(apr_pollcb_t *pollcb,
                                        apr_pollfd_t *descriptor)
 {
     apr_status_t rv = APR_SUCCESS;
     struct epoll_event ev = {0}; /* ignored, but must be passed with
                                   * kernel < 2.6.9
                                   */
-    int ret = -1;
+    int ret;
     
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         ret = epoll_ctl(pollcb->fd, EPOLL_CTL_DEL,
                         descriptor->desc.s->socketdes, &ev);
     }
     else {
         ret = epoll_ctl(pollcb->fd, EPOLL_CTL_DEL,
                         descriptor->desc.f->filedes, &ev);
     }
     
     if (ret < 0) {
         rv = APR_NOTFOUND;
     }
     
     return rv;
 }
 
 
 static apr_status_t impl_pollcb_poll(apr_pollcb_t *pollcb,
                                      apr_interval_time_t timeout,
                                      apr_pollcb_cb_t func,
                                      void *baton)
 {
     int ret, i;
     apr_status_t rv = APR_SUCCESS;
     
     if (timeout > 0) {
         timeout /= 1000;
     }
     
     ret = epoll_wait(pollcb->fd, pollcb->pollset.epoll, pollcb->nalloc,
                      timeout);
     if (ret < 0) {
         rv = apr_get_netos_error();
     }
     else if (ret == 0) {
         rv = APR_TIMEUP;
     }
     else {
         for (i = 0; i < ret; i++) {
             apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset.epoll[i].data.ptr);
+
+            if ((pollcb->flags & APR_POLLSET_WAKEABLE) &&
+                pollfd->desc_type == APR_POLL_FILE &&
+                pollfd->desc.f == pollcb->wakeup_pipe[0]) {
+                apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe);
+                return APR_EINTR;
+            }
+
             pollfd->rtnevents = get_epoll_revent(pollcb->pollset.epoll[i].events);
 
             rv = func(baton, pollfd);
             if (rv) {
                 return rv;
             }
         }
     }
     
     return rv;
 }
 
-static apr_pollcb_provider_t impl_cb = {
+static const apr_pollcb_provider_t impl_cb = {
     impl_pollcb_create,
     impl_pollcb_add,
     impl_pollcb_remove,
     impl_pollcb_poll,
+    impl_pollcb_cleanup,
     "epoll"
 };
 
-apr_pollcb_provider_t *apr_pollcb_provider_epoll = &impl_cb;
+const apr_pollcb_provider_t *const apr_pollcb_provider_epoll = &impl_cb;
 
 #endif /* HAVE_EPOLL */
Index: head/contrib/apr/poll/unix/kqueue.c
===================================================================
--- head/contrib/apr/poll/unix/kqueue.c	(revision 361677)
+++ head/contrib/apr/poll/unix/kqueue.c	(revision 361678)
@@ -1,497 +1,505 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_file_io.h"
 #include "apr_arch_networkio.h"
 #include "apr_arch_poll_private.h"
 #include "apr_arch_inherit.h"
 
 #ifdef HAVE_KQUEUE
 
 static apr_int16_t get_kqueue_revent(apr_int16_t event, apr_int16_t flags)
 {
     apr_int16_t rv = 0;
 
     if (event == EVFILT_READ)
         rv |= APR_POLLIN;
     else if (event == EVFILT_WRITE)
         rv |= APR_POLLOUT;
     if (flags & EV_EOF)
         rv |= APR_POLLHUP;
     /* APR_POLLPRI, APR_POLLERR, and APR_POLLNVAL are not handled by this
      * implementation.
      * TODO: See if EV_ERROR + certain system errors in the returned data field
      * should map to APR_POLLNVAL.
      */
     return rv;
 }
 
 struct apr_pollset_private_t
 {
     int kqueue_fd;
     struct kevent kevent;
     apr_uint32_t setsize;
     struct kevent *ke_set;
     apr_pollfd_t *result_set;
 #if APR_HAS_THREADS
     /* A thread mutex to protect operations on the rings */
     apr_thread_mutex_t *ring_lock;
 #endif
     /* A ring containing all of the pollfd_t that are active */
     APR_RING_HEAD(pfd_query_ring_t, pfd_elem_t) query_ring;
     /* A ring of pollfd_t that have been used, and then _remove'd */
     APR_RING_HEAD(pfd_free_ring_t, pfd_elem_t) free_ring;
     /* A ring of pollfd_t where rings that have been _remove'd but
        might still be inside a _poll */
     APR_RING_HEAD(pfd_dead_ring_t, pfd_elem_t) dead_ring;
 };
 
 static apr_status_t impl_pollset_cleanup(apr_pollset_t *pollset)
 {
     close(pollset->p->kqueue_fd);
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollset_create(apr_pollset_t *pollset,
                                         apr_uint32_t size,
                                         apr_pool_t *p,
                                         apr_uint32_t flags)
 {
     apr_status_t rv;
     pollset->p = apr_palloc(p, sizeof(apr_pollset_private_t));
 #if APR_HAS_THREADS
     if (flags & APR_POLLSET_THREADSAFE &&
         ((rv = apr_thread_mutex_create(&pollset->p->ring_lock,
                                        APR_THREAD_MUTEX_DEFAULT,
                                        p)) != APR_SUCCESS)) {
         pollset->p = NULL;
         return rv;
     }
 #else
     if (flags & APR_POLLSET_THREADSAFE) {
         pollset->p = NULL;
         return APR_ENOTIMPL;
     }
 #endif
 
     /* POLLIN and POLLOUT are represented in different returned
      * events, so we need 2 entries per descriptor in the result set,
      * both for what is returned by kevent() and what is returned to
      * the caller of apr_pollset_poll() (since it doesn't spend the
      * CPU to coalesce separate APR_POLLIN and APR_POLLOUT events
      * for the same descriptor)
      */
     pollset->p->setsize = 2 * size;
 
     pollset->p->ke_set =
         (struct kevent *) apr_palloc(p, pollset->p->setsize * sizeof(struct kevent));
 
     memset(pollset->p->ke_set, 0, pollset->p->setsize * sizeof(struct kevent));
 
     pollset->p->kqueue_fd = kqueue();
 
     if (pollset->p->kqueue_fd == -1) {
         pollset->p = NULL;
         return apr_get_netos_error();
     }
 
     {
         int flags;
 
         if ((flags = fcntl(pollset->p->kqueue_fd, F_GETFD)) == -1) {
             rv = errno;
             close(pollset->p->kqueue_fd);
             pollset->p = NULL;
             return rv;
         }
 
         flags |= FD_CLOEXEC;
         if (fcntl(pollset->p->kqueue_fd, F_SETFD, flags) == -1) {
             rv = errno;
             close(pollset->p->kqueue_fd);
             pollset->p = NULL;
             return rv;
         }
     }
 
     pollset->p->result_set = apr_palloc(p, pollset->p->setsize * sizeof(apr_pollfd_t));
 
     APR_RING_INIT(&pollset->p->query_ring, pfd_elem_t, link);
     APR_RING_INIT(&pollset->p->free_ring, pfd_elem_t, link);
     APR_RING_INIT(&pollset->p->dead_ring, pfd_elem_t, link);
 
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollset_add(apr_pollset_t *pollset,
                                      const apr_pollfd_t *descriptor)
 {
     apr_os_sock_t fd;
     pfd_elem_t *elem;
     apr_status_t rv = APR_SUCCESS;
 
     pollset_lock_rings();
 
     if (!APR_RING_EMPTY(&(pollset->p->free_ring), pfd_elem_t, link)) {
         elem = APR_RING_FIRST(&(pollset->p->free_ring));
         APR_RING_REMOVE(elem, link);
     }
     else {
         elem = (pfd_elem_t *) apr_palloc(pollset->pool, sizeof(pfd_elem_t));
         APR_RING_ELEM_INIT(elem, link);
     }
     elem->pfd = *descriptor;
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         fd = descriptor->desc.s->socketdes;
     }
     else {
         fd = descriptor->desc.f->filedes;
     }
 
     if (descriptor->reqevents & APR_POLLIN) {
         EV_SET(&pollset->p->kevent, fd, EVFILT_READ, EV_ADD, 0, 0, elem);
 
         if (kevent(pollset->p->kqueue_fd, &pollset->p->kevent, 1, NULL, 0,
                    NULL) == -1) {
             rv = apr_get_netos_error();
         }
     }
 
     if (descriptor->reqevents & APR_POLLOUT && rv == APR_SUCCESS) {
         EV_SET(&pollset->p->kevent, fd, EVFILT_WRITE, EV_ADD, 0, 0, elem);
 
         if (kevent(pollset->p->kqueue_fd, &pollset->p->kevent, 1, NULL, 0,
                    NULL) == -1) {
             rv = apr_get_netos_error();
         }
     }
 
     if (rv == APR_SUCCESS) {
         APR_RING_INSERT_TAIL(&(pollset->p->query_ring), elem, pfd_elem_t, link);
     }
     else {
         APR_RING_INSERT_TAIL(&(pollset->p->free_ring), elem, pfd_elem_t, link);
     }
 
     pollset_unlock_rings();
 
     return rv;
 }
 
 static apr_status_t impl_pollset_remove(apr_pollset_t *pollset,
                                         const apr_pollfd_t *descriptor)
 {
     pfd_elem_t *ep;
     apr_status_t rv;
     apr_os_sock_t fd;
 
     pollset_lock_rings();
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         fd = descriptor->desc.s->socketdes;
     }
     else {
         fd = descriptor->desc.f->filedes;
     }
 
     rv = APR_NOTFOUND; /* unless at least one of the specified conditions is */
     if (descriptor->reqevents & APR_POLLIN) {
         EV_SET(&pollset->p->kevent, fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
 
         if (kevent(pollset->p->kqueue_fd, &pollset->p->kevent, 1, NULL, 0,
                    NULL) != -1) {
             rv = APR_SUCCESS;
         }
     }
 
     if (descriptor->reqevents & APR_POLLOUT) {
         EV_SET(&pollset->p->kevent, fd, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
 
         if (kevent(pollset->p->kqueue_fd, &pollset->p->kevent, 1, NULL, 0,
                    NULL) != -1) {
             rv = APR_SUCCESS;
         }
     }
 
     for (ep = APR_RING_FIRST(&(pollset->p->query_ring));
          ep != APR_RING_SENTINEL(&(pollset->p->query_ring),
                                  pfd_elem_t, link);
          ep = APR_RING_NEXT(ep, link)) {
 
         if (descriptor->desc.s == ep->pfd.desc.s) {
             APR_RING_REMOVE(ep, link);
             APR_RING_INSERT_TAIL(&(pollset->p->dead_ring),
                                  ep, pfd_elem_t, link);
             break;
         }
     }
 
     pollset_unlock_rings();
 
     return rv;
 }
 
 static apr_status_t impl_pollset_poll(apr_pollset_t *pollset,
                                       apr_interval_time_t timeout,
                                       apr_int32_t *num,
                                       const apr_pollfd_t **descriptors)
 {
-    int ret, i, j;
+    int ret;
     struct timespec tv, *tvptr;
     apr_status_t rv = APR_SUCCESS;
-    apr_pollfd_t fd;
 
+    *num = 0;
+
     if (timeout < 0) {
         tvptr = NULL;
     }
     else {
         tv.tv_sec = (long) apr_time_sec(timeout);
         tv.tv_nsec = (long) apr_time_usec(timeout) * 1000;
         tvptr = &tv;
     }
 
     ret = kevent(pollset->p->kqueue_fd, NULL, 0, pollset->p->ke_set,
                  pollset->p->setsize, tvptr);
-    (*num) = ret;
     if (ret < 0) {
         rv = apr_get_netos_error();
     }
     else if (ret == 0) {
         rv = APR_TIMEUP;
     }
     else {
+        int i, j;
+        const apr_pollfd_t *fd;
+
         for (i = 0, j = 0; i < ret; i++) {
-            fd = (((pfd_elem_t*)(pollset->p->ke_set[i].udata))->pfd);
+            fd = &((pfd_elem_t *)pollset->p->ke_set[i].udata)->pfd;
             if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
-                fd.desc_type == APR_POLL_FILE &&
-                fd.desc.f == pollset->wakeup_pipe[0]) {
-                apr_pollset_drain_wakeup_pipe(pollset);
+                fd->desc_type == APR_POLL_FILE &&
+                fd->desc.f == pollset->wakeup_pipe[0]) {
+                apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe);
                 rv = APR_EINTR;
             }
             else {
-                pollset->p->result_set[j] = fd;
+                pollset->p->result_set[j] = *fd;
                 pollset->p->result_set[j].rtnevents =
                         get_kqueue_revent(pollset->p->ke_set[i].filter,
                                           pollset->p->ke_set[i].flags);
                 j++;
             }
         }
         if ((*num = j)) { /* any event besides wakeup pipe? */
             rv = APR_SUCCESS;
             if (descriptors) {
                 *descriptors = pollset->p->result_set;
             }
         }
     }
 
-
     pollset_lock_rings();
 
     /* Shift all PFDs in the Dead Ring to the Free Ring */
     APR_RING_CONCAT(&(pollset->p->free_ring), &(pollset->p->dead_ring),
                     pfd_elem_t, link);
 
     pollset_unlock_rings();
 
     return rv;
 }
 
-static apr_pollset_provider_t impl = {
+static const apr_pollset_provider_t impl = {
     impl_pollset_create,
     impl_pollset_add,
     impl_pollset_remove,
     impl_pollset_poll,
     impl_pollset_cleanup,
     "kqueue"
 };
 
-apr_pollset_provider_t *apr_pollset_provider_kqueue = &impl;
+const apr_pollset_provider_t *apr_pollset_provider_kqueue = &impl;
 
-static apr_status_t cb_cleanup(void *b_)
+static apr_status_t impl_pollcb_cleanup(apr_pollcb_t *pollcb)
 {
-    apr_pollcb_t *pollcb = (apr_pollcb_t *) b_;
     close(pollcb->fd);
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollcb_create(apr_pollcb_t *pollcb,
                                        apr_uint32_t size,
                                        apr_pool_t *p,
                                        apr_uint32_t flags)
 {
     int fd;
     
     fd = kqueue();
     if (fd < 0) {
         return apr_get_netos_error();
     }
 
     {
         int flags;
         apr_status_t rv;
 
         if ((flags = fcntl(fd, F_GETFD)) == -1) {
             rv = errno;
             close(fd);
             pollcb->fd = -1;
             return rv;
         }
 
         flags |= FD_CLOEXEC;
         if (fcntl(fd, F_SETFD, flags) == -1) {
             rv = errno;
             close(fd);
             pollcb->fd = -1;
             return rv;
         }
     }
  
     pollcb->fd = fd;
-    pollcb->pollset.ke = (struct kevent *)apr_pcalloc(p, 2 * size * sizeof(struct kevent));
-    apr_pool_cleanup_register(p, pollcb, cb_cleanup, apr_pool_cleanup_null);
+    pollcb->pollset.ke = (struct kevent *) apr_pcalloc(p, 2 * size * sizeof(struct kevent));
     
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollcb_add(apr_pollcb_t *pollcb,
                                     apr_pollfd_t *descriptor)
 {
     apr_os_sock_t fd;
     struct kevent ev;
     apr_status_t rv = APR_SUCCESS;
     
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         fd = descriptor->desc.s->socketdes;
     }
     else {
         fd = descriptor->desc.f->filedes;
     }
     
     if (descriptor->reqevents & APR_POLLIN) {
         EV_SET(&ev, fd, EVFILT_READ, EV_ADD, 0, 0, descriptor);
         
         if (kevent(pollcb->fd, &ev, 1, NULL, 0, NULL) == -1) {
             rv = apr_get_netos_error();
         }
     }
     
     if (descriptor->reqevents & APR_POLLOUT && rv == APR_SUCCESS) {
         EV_SET(&ev, fd, EVFILT_WRITE, EV_ADD, 0, 0, descriptor);
         
         if (kevent(pollcb->fd, &ev, 1, NULL, 0, NULL) == -1) {
             rv = apr_get_netos_error();
         }
     }
     
     return rv;
 }
 
 static apr_status_t impl_pollcb_remove(apr_pollcb_t *pollcb,
                                        apr_pollfd_t *descriptor)
 {
     apr_status_t rv;
     struct kevent ev;
     apr_os_sock_t fd;
     
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         fd = descriptor->desc.s->socketdes;
     }
     else {
         fd = descriptor->desc.f->filedes;
     }
 
     rv = APR_NOTFOUND; /* unless at least one of the specified conditions is */
     if (descriptor->reqevents & APR_POLLIN) {
         EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
         
         if (kevent(pollcb->fd, &ev, 1, NULL, 0, NULL) != -1) {
             rv = APR_SUCCESS;
         }
     }
     
     if (descriptor->reqevents & APR_POLLOUT) {
         EV_SET(&ev, fd, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
         
         if (kevent(pollcb->fd, &ev, 1, NULL, 0, NULL) != -1) {
             rv = APR_SUCCESS;
         }
     }
     
     return rv;
 }
 
 
 static apr_status_t impl_pollcb_poll(apr_pollcb_t *pollcb,
                                      apr_interval_time_t timeout,
                                      apr_pollcb_cb_t func,
                                      void *baton)
 {
     int ret, i;
     struct timespec tv, *tvptr;
     apr_status_t rv = APR_SUCCESS;
     
     if (timeout < 0) {
         tvptr = NULL;
     }
     else {
         tv.tv_sec = (long) apr_time_sec(timeout);
         tv.tv_nsec = (long) apr_time_usec(timeout) * 1000;
         tvptr = &tv;
     }
     
     ret = kevent(pollcb->fd, NULL, 0, pollcb->pollset.ke, 2 * pollcb->nalloc,
                  tvptr);
 
     if (ret < 0) {
         rv = apr_get_netos_error();
     }
     else if (ret == 0) {
         rv = APR_TIMEUP;
     }
     else {
         for (i = 0; i < ret; i++) {
             apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset.ke[i].udata);
-            
+
+            if ((pollcb->flags & APR_POLLSET_WAKEABLE) &&
+                pollfd->desc_type == APR_POLL_FILE &&
+                pollfd->desc.f == pollcb->wakeup_pipe[0]) {
+                apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe);
+                return APR_EINTR;
+            }
+
             pollfd->rtnevents = get_kqueue_revent(pollcb->pollset.ke[i].filter,
                                                   pollcb->pollset.ke[i].flags);
             
             rv = func(baton, pollfd);
             
             if (rv) {
                 return rv;
             }
         }
     }
 
     return rv;
 }
 
-static apr_pollcb_provider_t impl_cb = {
+static const apr_pollcb_provider_t impl_cb = {
     impl_pollcb_create,
     impl_pollcb_add,
     impl_pollcb_remove,
     impl_pollcb_poll,
+    impl_pollcb_cleanup,
     "kqueue"
 };
 
-apr_pollcb_provider_t *apr_pollcb_provider_kqueue = &impl_cb;
+const apr_pollcb_provider_t *apr_pollcb_provider_kqueue = &impl_cb;
 
 #endif /* HAVE_KQUEUE */
Index: head/contrib/apr/poll/unix/poll.c
===================================================================
--- head/contrib/apr/poll/unix/poll.c	(revision 361677)
+++ head/contrib/apr/poll/unix/poll.c	(revision 361678)
@@ -1,450 +1,460 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_file_io.h"
 #include "apr_arch_networkio.h"
 #include "apr_arch_misc.h"
 #include "apr_arch_poll_private.h"
 
 #if defined(HAVE_POLL)
 
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
 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;
     /* POLLERR, POLLHUP, and POLLNVAL aren't valid as requested events */
 
     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;
 }
 
 #ifdef POLL_USES_POLL
 
 #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;
 
     if (i > 0) { /* poll() sets revents only if an event was signalled;
                   * we don't promise to set rtnevents unless an event
                   * was signalled
                   */
         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;
 }
 
 
 #endif /* POLL_USES_POLL */
 
 struct apr_pollset_private_t
 {
     struct pollfd *pollset;
     apr_pollfd_t *query_set;
     apr_pollfd_t *result_set;
 };
 
 static apr_status_t impl_pollset_create(apr_pollset_t *pollset,
                                         apr_uint32_t size,
                                         apr_pool_t *p,
                                         apr_uint32_t flags)
 {
     if (flags & APR_POLLSET_THREADSAFE) {                
         return APR_ENOTIMPL;
     }
 #ifdef WIN32
     if (!APR_HAVE_LATE_DLL_FUNC(WSAPoll)) {
         return APR_ENOTIMPL;
     }
 #endif
     pollset->p = apr_palloc(p, sizeof(apr_pollset_private_t));
     pollset->p->pollset = apr_palloc(p, size * sizeof(struct pollfd));
     pollset->p->query_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
     pollset->p->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
 
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollset_add(apr_pollset_t *pollset,
                                      const apr_pollfd_t *descriptor)
 {
     if (pollset->nelts == pollset->nalloc) {
         return APR_ENOMEM;
     }
 
     pollset->p->query_set[pollset->nelts] = *descriptor;
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         pollset->p->pollset[pollset->nelts].fd = descriptor->desc.s->socketdes;
     }
     else {
 #if APR_FILES_AS_SOCKETS
         pollset->p->pollset[pollset->nelts].fd = descriptor->desc.f->filedes;
 #else
         if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
             descriptor->desc.f == pollset->wakeup_pipe[0])
             pollset->p->pollset[pollset->nelts].fd = (SOCKET)descriptor->desc.f->filedes;
         else
             return APR_EBADF;
 #endif
     }
     pollset->p->pollset[pollset->nelts].events =
         get_event(descriptor->reqevents);
     pollset->nelts++;
 
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_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->p->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->p->query_set[i].desc.s) {
                     pollset->nelts--;
                 }
                 else {
                     pollset->p->pollset[dst] = pollset->p->pollset[i];
                     pollset->p->query_set[dst] = pollset->p->query_set[i];
                     dst++;
                 }
             }
             return APR_SUCCESS;
         }
     }
 
     return APR_NOTFOUND;
 }
 
 static apr_status_t impl_pollset_poll(apr_pollset_t *pollset,
                                       apr_interval_time_t timeout,
                                       apr_int32_t *num,
                                       const apr_pollfd_t **descriptors)
 {
     int ret;
     apr_status_t rv = APR_SUCCESS;
 
+    *num = 0;
+
 #ifdef WIN32
     /* WSAPoll() requires at least one socket. */
     if (pollset->nelts == 0) {
-        *num = 0;
         if (timeout > 0) {
             apr_sleep(timeout);
             return APR_TIMEUP;
         }
         return APR_SUCCESS;
     }
     if (timeout > 0) {
         timeout /= 1000;
     }
     ret = WSAPoll(pollset->p->pollset, pollset->nelts, (int)timeout);
 #else
     if (timeout > 0) {
         timeout /= 1000;
     }
     ret = poll(pollset->p->pollset, pollset->nelts, timeout);
 #endif
-    (*num) = ret;
     if (ret < 0) {
         return apr_get_netos_error();
     }
     else if (ret == 0) {
         return APR_TIMEUP;
     }
     else {
         apr_uint32_t i, j;
 
         for (i = 0, j = 0; i < pollset->nelts; i++) {
             if (pollset->p->pollset[i].revents != 0) {
                 /* Check if the polled descriptor is our
                  * wakeup pipe. In that case do not put it result set.
                  */
                 if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
                     pollset->p->query_set[i].desc_type == APR_POLL_FILE &&
                     pollset->p->query_set[i].desc.f == pollset->wakeup_pipe[0]) {
-                        apr_pollset_drain_wakeup_pipe(pollset);
-                        rv = APR_EINTR;
+                    apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe);
+                    rv = APR_EINTR;
                 }
                 else {
                     pollset->p->result_set[j] = pollset->p->query_set[i];
                     pollset->p->result_set[j].rtnevents =
                         get_revent(pollset->p->pollset[i].revents);
                     j++;
                 }
             }
         }
-        if (((*num) = j) > 0)
+        if ((*num = j)) { /* any event besides wakeup pipe? */
             rv = APR_SUCCESS;
+        }
     }
     if (descriptors && (*num))
         *descriptors = pollset->p->result_set;
     return rv;
 }
 
-static apr_pollset_provider_t impl = {
+static const apr_pollset_provider_t impl = {
     impl_pollset_create,
     impl_pollset_add,
     impl_pollset_remove,
     impl_pollset_poll,
     NULL,
     "poll"
 };
 
-apr_pollset_provider_t *apr_pollset_provider_poll = &impl;
+const apr_pollset_provider_t *apr_pollset_provider_poll = &impl;
 
 /* Poll method pollcb.
  * This is probably usable only for WIN32 having WSAPoll
  */
 static apr_status_t impl_pollcb_create(apr_pollcb_t *pollcb,
                                        apr_uint32_t size,
                                        apr_pool_t *p,
                                        apr_uint32_t flags)
 {
 #if APR_HAS_THREADS
     return APR_ENOTIMPL;
 #else
     pollcb->fd = -1;
 #ifdef WIN32
     if (!APR_HAVE_LATE_DLL_FUNC(WSAPoll)) {
         return APR_ENOTIMPL;
     }
 #endif
 
     pollcb->pollset.ps = apr_palloc(p, size * sizeof(struct pollfd));
     pollcb->copyset = apr_palloc(p, size * sizeof(apr_pollfd_t *));
 
     return APR_SUCCESS;
 #endif
 }
 
 static apr_status_t impl_pollcb_add(apr_pollcb_t *pollcb,
                                     apr_pollfd_t *descriptor)
 {
     if (pollcb->nelts == pollcb->nalloc) {
         return APR_ENOMEM;
     }
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         pollcb->pollset.ps[pollcb->nelts].fd = descriptor->desc.s->socketdes;
     }
     else {
 #if APR_FILES_AS_SOCKETS
         pollcb->pollset.ps[pollcb->nelts].fd = descriptor->desc.f->filedes;
 #else
         return APR_EBADF;
 #endif
     }
 
     pollcb->pollset.ps[pollcb->nelts].events =
         get_event(descriptor->reqevents);
     pollcb->copyset[pollcb->nelts] = descriptor;
     pollcb->nelts++;
     
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollcb_remove(apr_pollcb_t *pollcb,
                                        apr_pollfd_t *descriptor)
 {
     apr_uint32_t i;
 
     for (i = 0; i < pollcb->nelts; i++) {
         if (descriptor->desc.s == pollcb->copyset[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 = pollcb->nelts;
             pollcb->nelts--;
             for (i++; i < old_nelts; i++) {
                 if (descriptor->desc.s == pollcb->copyset[i]->desc.s) {
                     pollcb->nelts--;
                 }
                 else {
                     pollcb->pollset.ps[dst] = pollcb->pollset.ps[i];
                     pollcb->copyset[dst] = pollcb->copyset[i];
                     dst++;
                 }
             }
             return APR_SUCCESS;
         }
     }
 
     return APR_NOTFOUND;
 }
 
 static apr_status_t impl_pollcb_poll(apr_pollcb_t *pollcb,
                                      apr_interval_time_t timeout,
                                      apr_pollcb_cb_t func,
                                      void *baton)
 {
     int ret;
     apr_status_t rv = APR_SUCCESS;
     apr_uint32_t i;
 
 #ifdef WIN32
     /* WSAPoll() requires at least one socket. */
     if (pollcb->nelts == 0) {
         if (timeout > 0) {
             apr_sleep(timeout);
             return APR_TIMEUP;
         }
         return APR_SUCCESS;
     }
     if (timeout > 0) {
         timeout /= 1000;
     }
     ret = WSAPoll(pollcb->pollset.ps, pollcb->nelts, (int)timeout);
 #else
     if (timeout > 0) {
         timeout /= 1000;
     }
     ret = poll(pollcb->pollset.ps, pollcb->nelts, timeout);
 #endif
     if (ret < 0) {
         return apr_get_netos_error();
     }
     else if (ret == 0) {
         return APR_TIMEUP;
     }
     else {
         for (i = 0; i < pollcb->nelts; i++) {
             if (pollcb->pollset.ps[i].revents != 0) {
                 apr_pollfd_t *pollfd = pollcb->copyset[i];
+
+                if ((pollcb->flags & APR_POLLSET_WAKEABLE) &&
+                    pollfd->desc_type == APR_POLL_FILE &&
+                    pollfd->desc.f == pollcb->wakeup_pipe[0]) {
+                    apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe);
+                    return APR_EINTR;
+                }
+
                 pollfd->rtnevents = get_revent(pollcb->pollset.ps[i].revents);                    
                 rv = func(baton, pollfd);
                 if (rv) {
                     return rv;
                 }
             }
         }
     }
     return rv;
 }
 
-static apr_pollcb_provider_t impl_cb = {
+static const apr_pollcb_provider_t impl_cb = {
     impl_pollcb_create,
     impl_pollcb_add,
     impl_pollcb_remove,
     impl_pollcb_poll,
+    NULL,
     "poll"
 };
 
-apr_pollcb_provider_t *apr_pollcb_provider_poll = &impl_cb;
+const apr_pollcb_provider_t *apr_pollcb_provider_poll = &impl_cb;
 
 #endif /* HAVE_POLL */
Index: head/contrib/apr/poll/unix/pollcb.c
===================================================================
--- head/contrib/apr/poll/unix/pollcb.c	(revision 361677)
+++ head/contrib/apr/poll/unix/pollcb.c	(revision 361678)
@@ -1,175 +1,224 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 WIN32
 /* POSIX defines 1024 for the FD_SETSIZE */
 #define FD_SETSIZE 1024
 #endif
 
 #include "apr.h"
 #include "apr_poll.h"
 #include "apr_time.h"
 #include "apr_portable.h"
 #include "apr_arch_file_io.h"
 #include "apr_arch_networkio.h"
 #include "apr_arch_poll_private.h"
 
 static apr_pollset_method_e pollset_default_method = POLLSET_DEFAULT_METHOD;
 #if defined(HAVE_KQUEUE)
-extern apr_pollcb_provider_t *apr_pollcb_provider_kqueue;
+extern const apr_pollcb_provider_t *apr_pollcb_provider_kqueue;
 #endif
 #if defined(HAVE_PORT_CREATE)
-extern apr_pollcb_provider_t *apr_pollcb_provider_port;
+extern const apr_pollcb_provider_t *apr_pollcb_provider_port;
 #endif
 #if defined(HAVE_EPOLL)
-extern apr_pollcb_provider_t *apr_pollcb_provider_epoll;
+extern const apr_pollcb_provider_t *apr_pollcb_provider_epoll;
 #endif
 #if defined(HAVE_POLL)
-extern apr_pollcb_provider_t *apr_pollcb_provider_poll;
+extern const apr_pollcb_provider_t *apr_pollcb_provider_poll;
 #endif
 
-static apr_pollcb_provider_t *pollcb_provider(apr_pollset_method_e method)
+static const apr_pollcb_provider_t *pollcb_provider(apr_pollset_method_e method)
 {
-    apr_pollcb_provider_t *provider = NULL;
+    const apr_pollcb_provider_t *provider = NULL;
     switch (method) {
         case APR_POLLSET_KQUEUE:
 #if defined(HAVE_KQUEUE)
             provider = apr_pollcb_provider_kqueue;
 #endif
         break;
         case APR_POLLSET_PORT:
 #if defined(HAVE_PORT_CREATE)
             provider = apr_pollcb_provider_port;
 #endif
         break;
         case APR_POLLSET_EPOLL:
 #if defined(HAVE_EPOLL)
             provider = apr_pollcb_provider_epoll;
 #endif
         break;
         case APR_POLLSET_POLL:
 #if defined(HAVE_POLL)
             provider = apr_pollcb_provider_poll;
 #endif
         break;
         case APR_POLLSET_SELECT:
         case APR_POLLSET_AIO_MSGQ:
         case APR_POLLSET_DEFAULT:
         break;
     }
     return provider;
 }
 
+static apr_status_t pollcb_cleanup(void *p)
+{
+    apr_pollcb_t *pollcb = (apr_pollcb_t *) p;
+
+    if (pollcb->provider->cleanup) {
+        (*pollcb->provider->cleanup)(pollcb);
+    }
+    if (pollcb->flags & APR_POLLSET_WAKEABLE) {
+        apr_poll_close_wakeup_pipe(pollcb->wakeup_pipe);
+    }
+
+    return APR_SUCCESS;
+}
+
 APR_DECLARE(apr_status_t) apr_pollcb_create_ex(apr_pollcb_t **ret_pollcb,
                                                apr_uint32_t size,
                                                apr_pool_t *p,
                                                apr_uint32_t flags,
                                                apr_pollset_method_e method)
 {
     apr_status_t rv;
     apr_pollcb_t *pollcb;
-    apr_pollcb_provider_t *provider = NULL;
+    const apr_pollcb_provider_t *provider = NULL;
 
     *ret_pollcb = NULL;
 
  #ifdef WIN32
     /* This will work only if ws2_32.dll has WSAPoll funtion.
      * We could check the presence of the function here,
      * but someone might implement other pollcb method in
      * the future.
      */
     if (method == APR_POLLSET_DEFAULT) {
         method = APR_POLLSET_POLL;
     }
  #endif
 
     if (method == APR_POLLSET_DEFAULT)
         method = pollset_default_method;
     while (provider == NULL) {
         provider = pollcb_provider(method);
         if (!provider) {
             if ((flags & APR_POLLSET_NODEFAULT) == APR_POLLSET_NODEFAULT)
                 return APR_ENOTIMPL;
             if (method == pollset_default_method)
                 return APR_ENOTIMPL;
             method = pollset_default_method;
         }
     }
 
+    if (flags & APR_POLLSET_WAKEABLE) {
+        /* Add room for wakeup descriptor */
+        size++;
+    }
+
     pollcb = apr_palloc(p, sizeof(*pollcb));
     pollcb->nelts = 0;
     pollcb->nalloc = size;
+    pollcb->flags = flags;
     pollcb->pool = p;
     pollcb->provider = provider;
 
     rv = (*provider->create)(pollcb, size, p, flags);
     if (rv == APR_ENOTIMPL) {
         if (method == pollset_default_method) {
             return rv;
         }
 
         if ((flags & APR_POLLSET_NODEFAULT) == APR_POLLSET_NODEFAULT) {
             return rv;
         }
 
         /* Try with default provider */
         provider = pollcb_provider(pollset_default_method);
         if (!provider) {
             return APR_ENOTIMPL;
         }
         rv = (*provider->create)(pollcb, size, p, flags);
         if (rv != APR_SUCCESS) {
             return rv;
         }
         pollcb->provider = provider;
     }
     else if (rv != APR_SUCCESS) {
         return rv;
     }
 
+    if (flags & APR_POLLSET_WAKEABLE) {
+        /* Create wakeup pipe */
+        if ((rv = apr_poll_create_wakeup_pipe(pollcb->pool, &pollcb->wakeup_pfd,
+                                              pollcb->wakeup_pipe)) 
+                != APR_SUCCESS) {
+            return rv;
+        }
+
+        if ((rv = apr_pollcb_add(pollcb, &pollcb->wakeup_pfd)) != APR_SUCCESS) {
+            return rv;
+        }
+    }
+    if ((flags & APR_POLLSET_WAKEABLE) || provider->cleanup)
+        apr_pool_cleanup_register(p, pollcb, pollcb_cleanup,
+                                  apr_pool_cleanup_null);
+
     *ret_pollcb = pollcb;
     return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_pollcb_create(apr_pollcb_t **pollcb,
                                             apr_uint32_t size,
                                             apr_pool_t *p,
                                             apr_uint32_t flags)
 {
     apr_pollset_method_e method = APR_POLLSET_DEFAULT;
     return apr_pollcb_create_ex(pollcb, size, p, flags, method);
 }
 
 APR_DECLARE(apr_status_t) apr_pollcb_add(apr_pollcb_t *pollcb,
                                          apr_pollfd_t *descriptor)
 {
     return (*pollcb->provider->add)(pollcb, descriptor);
 }
 
 APR_DECLARE(apr_status_t) apr_pollcb_remove(apr_pollcb_t *pollcb,
                                             apr_pollfd_t *descriptor)
 {
     return (*pollcb->provider->remove)(pollcb, descriptor);
 }
 
 
 APR_DECLARE(apr_status_t) apr_pollcb_poll(apr_pollcb_t *pollcb,
                                           apr_interval_time_t timeout,
                                           apr_pollcb_cb_t func,
                                           void *baton)
 {
     return (*pollcb->provider->poll)(pollcb, timeout, func, baton);
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_wakeup(apr_pollcb_t *pollcb)
+{
+    if (pollcb->flags & APR_POLLSET_WAKEABLE)
+        return apr_file_putc(1, pollcb->wakeup_pipe[1]);
+    else
+        return APR_EINIT;
+}
+
+APR_DECLARE(const char *) apr_pollcb_method_name(apr_pollcb_t *pollcb)
+{
+    return pollcb->provider->name;
 }
Index: head/contrib/apr/poll/unix/pollset.c
===================================================================
--- head/contrib/apr/poll/unix/pollset.c	(revision 361677)
+++ head/contrib/apr/poll/unix/pollset.c	(revision 361678)
@@ -1,352 +1,247 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 WIN32
 /* POSIX defines 1024 for the FD_SETSIZE */
 #define FD_SETSIZE 1024
 #endif
 
 #include "apr.h"
 #include "apr_poll.h"
 #include "apr_time.h"
 #include "apr_portable.h"
 #include "apr_arch_file_io.h"
 #include "apr_arch_networkio.h"
 #include "apr_arch_poll_private.h"
 #include "apr_arch_inherit.h"
 
 static apr_pollset_method_e pollset_default_method = POLLSET_DEFAULT_METHOD;
 
-#if !APR_FILES_AS_SOCKETS
-#if defined (WIN32)
-
-/* Create a dummy wakeup socket pipe for interrupting the poller
- */
-static apr_status_t create_wakeup_pipe(apr_pollset_t *pollset)
-{
-    apr_status_t rv;
-
-    if ((rv = apr_file_socket_pipe_create(&pollset->wakeup_pipe[0],
-                                          &pollset->wakeup_pipe[1],
-                                          pollset->pool)) != APR_SUCCESS)
-        return rv;
-
-    pollset->wakeup_pfd.p = pollset->pool;
-    pollset->wakeup_pfd.reqevents = APR_POLLIN;
-    pollset->wakeup_pfd.desc_type = APR_POLL_FILE;
-    pollset->wakeup_pfd.desc.f = pollset->wakeup_pipe[0];
-
-    return apr_pollset_add(pollset, &pollset->wakeup_pfd);
-}
-
-#else  /* !WIN32 */
-static apr_status_t create_wakeup_pipe(apr_pollset_t *pollset)
-{
-    return APR_ENOTIMPL;
-}
-
-static apr_status_t apr_file_socket_pipe_close(apr_file_t *file)
-{
-    return APR_ENOTIMPL;
-}
-
-#endif /* WIN32 */
-#else  /* APR_FILES_AS_SOCKETS */
-
-/* Create a dummy wakeup pipe for interrupting the poller
- */
-static apr_status_t create_wakeup_pipe(apr_pollset_t *pollset)
-{
-    apr_status_t rv;
-
-    if ((rv = apr_file_pipe_create(&pollset->wakeup_pipe[0],
-                                   &pollset->wakeup_pipe[1],
-                                   pollset->pool)) != APR_SUCCESS)
-        return rv;
-
-    pollset->wakeup_pfd.p = pollset->pool;
-    pollset->wakeup_pfd.reqevents = APR_POLLIN;
-    pollset->wakeup_pfd.desc_type = APR_POLL_FILE;
-    pollset->wakeup_pfd.desc.f = pollset->wakeup_pipe[0];
-
-    {
-        int flags;
-
-        if ((flags = fcntl(pollset->wakeup_pipe[0]->filedes, F_GETFD)) == -1)
-            return errno;
-
-        flags |= FD_CLOEXEC;
-        if (fcntl(pollset->wakeup_pipe[0]->filedes, F_SETFD, flags) == -1)
-            return errno;
-    }
-    {
-        int flags;
-
-        if ((flags = fcntl(pollset->wakeup_pipe[1]->filedes, F_GETFD)) == -1)
-            return errno;
-
-        flags |= FD_CLOEXEC;
-        if (fcntl(pollset->wakeup_pipe[1]->filedes, F_SETFD, flags) == -1)
-            return errno;
-    }
-
-    return apr_pollset_add(pollset, &pollset->wakeup_pfd);
-}
-#endif /* !APR_FILES_AS_SOCKETS */
-
-/* Read and discard what's ever in the wakeup pipe.
- */
-void apr_pollset_drain_wakeup_pipe(apr_pollset_t *pollset)
-{
-    char rb[512];
-    apr_size_t nr = sizeof(rb);
-
-    while (apr_file_read(pollset->wakeup_pipe[0], rb, &nr) == APR_SUCCESS) {
-        /* Although we write just one byte to the other end of the pipe
-         * during wakeup, multiple threads could call the wakeup.
-         * So simply drain out from the input side of the pipe all
-         * the data.
-         */
-        if (nr != sizeof(rb))
-            break;
-    }
-}
-
 static apr_status_t pollset_cleanup(void *p)
 {
     apr_pollset_t *pollset = (apr_pollset_t *) p;
     if (pollset->provider->cleanup) {
         (*pollset->provider->cleanup)(pollset);
     }
     if (pollset->flags & APR_POLLSET_WAKEABLE) {
-        /* Close both sides of the wakeup pipe */
-        if (pollset->wakeup_pipe[0]) {
-#if APR_FILES_AS_SOCKETS
-            apr_file_close(pollset->wakeup_pipe[0]);
-#else
-            apr_file_socket_pipe_close(pollset->wakeup_pipe[0]);
-#endif
-            pollset->wakeup_pipe[0] = NULL;
-        }
-        if (pollset->wakeup_pipe[1]) {
-#if APR_FILES_AS_SOCKETS
-            apr_file_close(pollset->wakeup_pipe[1]);
-#else
-            apr_file_socket_pipe_close(pollset->wakeup_pipe[1]);
-#endif
-            pollset->wakeup_pipe[1] = NULL;
-        }
+        apr_poll_close_wakeup_pipe(pollset->wakeup_pipe);
     }
 
     return APR_SUCCESS;
 }
 
 #if defined(HAVE_KQUEUE)
-extern apr_pollset_provider_t *apr_pollset_provider_kqueue;
+extern const apr_pollset_provider_t *apr_pollset_provider_kqueue;
 #endif
 #if defined(HAVE_PORT_CREATE)
-extern apr_pollset_provider_t *apr_pollset_provider_port;
+extern const apr_pollset_provider_t *apr_pollset_provider_port;
 #endif
 #if defined(HAVE_EPOLL)
-extern apr_pollset_provider_t *apr_pollset_provider_epoll;
+extern const apr_pollset_provider_t *apr_pollset_provider_epoll;
 #endif
 #if defined(HAVE_AIO_MSGQ)
-extern apr_pollset_provider_t *apr_pollset_provider_aio_msgq;
+extern const apr_pollset_provider_t *apr_pollset_provider_aio_msgq;
 #endif
 #if defined(HAVE_POLL)
-extern apr_pollset_provider_t *apr_pollset_provider_poll;
+extern const apr_pollset_provider_t *apr_pollset_provider_poll;
 #endif
-extern apr_pollset_provider_t *apr_pollset_provider_select;
+extern const apr_pollset_provider_t *apr_pollset_provider_select;
 
-static apr_pollset_provider_t *pollset_provider(apr_pollset_method_e method)
+static const apr_pollset_provider_t *pollset_provider(apr_pollset_method_e method)
 {
-    apr_pollset_provider_t *provider = NULL;
+    const apr_pollset_provider_t *provider = NULL;
     switch (method) {
         case APR_POLLSET_KQUEUE:
 #if defined(HAVE_KQUEUE)
             provider = apr_pollset_provider_kqueue;
 #endif
         break;
         case APR_POLLSET_PORT:
 #if defined(HAVE_PORT_CREATE)
             provider = apr_pollset_provider_port;
 #endif
         break;
         case APR_POLLSET_EPOLL:
 #if defined(HAVE_EPOLL)
             provider = apr_pollset_provider_epoll;
 #endif
         break;
         case APR_POLLSET_AIO_MSGQ:
 #if defined(HAVE_AIO_MSGQ)
             provider = apr_pollset_provider_aio_msgq;
 #endif
         break;
         case APR_POLLSET_POLL:
 #if defined(HAVE_POLL)
             provider = apr_pollset_provider_poll;
 #endif
         break;
         case APR_POLLSET_SELECT:
             provider = apr_pollset_provider_select;
         break;
         case APR_POLLSET_DEFAULT:
         break;
     }
     return provider;
 }
 
 APR_DECLARE(apr_status_t) apr_pollset_create_ex(apr_pollset_t **ret_pollset,
                                                 apr_uint32_t size,
                                                 apr_pool_t *p,
                                                 apr_uint32_t flags,
                                                 apr_pollset_method_e method)
 {
     apr_status_t rv;
     apr_pollset_t *pollset;
-    apr_pollset_provider_t *provider = NULL;
+    const apr_pollset_provider_t *provider = NULL;
 
     *ret_pollset = NULL;
 
  #ifdef WIN32
     /* Favor WSAPoll if supported.
      * This will work only if ws2_32.dll has WSAPoll funtion.
      * In other cases it will fall back to select() method unless
      * the APR_POLLSET_NODEFAULT is added to the flags.
      */
     if (method == APR_POLLSET_DEFAULT) {
         method = APR_POLLSET_POLL;
     }
  #endif
 
     if (method == APR_POLLSET_DEFAULT)
         method = pollset_default_method;
     while (provider == NULL) {
         provider = pollset_provider(method);
         if (!provider) {
             if ((flags & APR_POLLSET_NODEFAULT) == APR_POLLSET_NODEFAULT)
                 return APR_ENOTIMPL;
             if (method == pollset_default_method)
                 return APR_ENOTIMPL;
             method = pollset_default_method;
         }
     }
     if (flags & APR_POLLSET_WAKEABLE) {
         /* Add room for wakeup descriptor */
         size++;
     }
 
     pollset = apr_palloc(p, sizeof(*pollset));
     pollset->nelts = 0;
     pollset->nalloc = size;
     pollset->pool = p;
     pollset->flags = flags;
     pollset->provider = provider;
 
     rv = (*provider->create)(pollset, size, p, flags);
     if (rv == APR_ENOTIMPL) {
         if (method == pollset_default_method) {
             return rv;
         }
         provider = pollset_provider(pollset_default_method);
         if (!provider) {
             return APR_ENOTIMPL;
         }
         rv = (*provider->create)(pollset, size, p, flags);
         if (rv != APR_SUCCESS) {
             return rv;
         }
         pollset->provider = provider;
     }
     else if (rv != APR_SUCCESS) {
         return rv;
     }
     if (flags & APR_POLLSET_WAKEABLE) {
         /* Create wakeup pipe */
-        if ((rv = create_wakeup_pipe(pollset)) != APR_SUCCESS) {
+        if ((rv = apr_poll_create_wakeup_pipe(pollset->pool, &pollset->wakeup_pfd,
+                                              pollset->wakeup_pipe))
+                != APR_SUCCESS) {
             return rv;
         }
+
+        if ((rv = apr_pollset_add(pollset, &pollset->wakeup_pfd)) != APR_SUCCESS) {
+            return rv;
+        }
     }
     if ((flags & APR_POLLSET_WAKEABLE) || provider->cleanup)
         apr_pool_cleanup_register(p, pollset, pollset_cleanup,
                                   apr_pool_cleanup_null);
 
     *ret_pollset = pollset;
     return APR_SUCCESS;
 }
 
 APR_DECLARE(const char *) apr_pollset_method_name(apr_pollset_t *pollset)
 {
     return pollset->provider->name;
 }
 
 APR_DECLARE(const char *) apr_poll_method_defname()
 {
-    apr_pollset_provider_t *provider = NULL;
+    const apr_pollset_provider_t *provider = NULL;
 
     provider = pollset_provider(pollset_default_method);
     if (provider)
         return provider->name;
     else
         return "unknown";
 }
 
 APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
                                              apr_uint32_t size,
                                              apr_pool_t *p,
                                              apr_uint32_t flags)
 {
     apr_pollset_method_e method = APR_POLLSET_DEFAULT;
     return apr_pollset_create_ex(pollset, size, p, flags, method);
 }
 
 APR_DECLARE(apr_status_t) apr_pollset_destroy(apr_pollset_t * pollset)
 {
     if (pollset->flags & APR_POLLSET_WAKEABLE ||
         pollset->provider->cleanup)
         return apr_pool_cleanup_run(pollset->pool, pollset,
                                     pollset_cleanup);
     else
         return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_pollset_wakeup(apr_pollset_t *pollset)
 {
     if (pollset->flags & APR_POLLSET_WAKEABLE)
         return apr_file_putc(1, pollset->wakeup_pipe[1]);
     else
         return APR_EINIT;
 }
 
 APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
                                           const apr_pollfd_t *descriptor)
 {
     return (*pollset->provider->add)(pollset, descriptor);
 }
 
 APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
                                              const apr_pollfd_t *descriptor)
 {
     return (*pollset->provider->remove)(pollset, descriptor);
 }
 
 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)
 {
     return (*pollset->provider->poll)(pollset, timeout, num, descriptors);
 }
Index: head/contrib/apr/poll/unix/port.c
===================================================================
--- head/contrib/apr/poll/unix/port.c	(revision 361677)
+++ head/contrib/apr/poll/unix/port.c	(revision 361678)
@@ -1,594 +1,594 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_atomic.h"
 #include "apr_arch_file_io.h"
 #include "apr_arch_networkio.h"
 #include "apr_arch_poll_private.h"
 #include "apr_arch_inherit.h"
 
 #if defined(HAVE_PORT_CREATE)
 
 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;
     /* POLLERR, POLLHUP, and POLLNVAL aren't valid as requested events */
 
     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;
 }
 
 
 struct apr_pollset_private_t
 {
     int port_fd;
     port_event_t *port_set;
     apr_pollfd_t *result_set;
 #if APR_HAS_THREADS
     /* A thread mutex to protect operations on the rings */
     apr_thread_mutex_t *ring_lock;
 #endif
     /* A ring containing all of the pollfd_t that are active */
     APR_RING_HEAD(pfd_query_ring_t, pfd_elem_t) query_ring;
     /* A ring containing the pollfd_t that will be added on the
      * next call to apr_pollset_poll().
      */
     APR_RING_HEAD(pfd_add_ring_t, pfd_elem_t) add_ring;
     /* A ring of pollfd_t that have been used, and then _remove'd */
     APR_RING_HEAD(pfd_free_ring_t, pfd_elem_t) free_ring;
     /* A ring of pollfd_t where rings that have been _remove'd but
        might still be inside a _poll */
     APR_RING_HEAD(pfd_dead_ring_t, pfd_elem_t) dead_ring;
     /* number of threads in poll */
     volatile apr_uint32_t waiting;
 };
 
 static apr_status_t call_port_getn(int port, port_event_t list[], 
                                    unsigned int max, unsigned int *nget,
                                    apr_interval_time_t timeout)
 {
     struct timespec tv, *tvptr;
     int ret;
     apr_status_t rv = APR_SUCCESS;
 
     if (timeout < 0) {
         tvptr = NULL;
     }
     else {
         tv.tv_sec = (long) apr_time_sec(timeout);
         tv.tv_nsec = (long) apr_time_usec(timeout) * 1000;
         tvptr = &tv;
     }
 
     list[0].portev_user = (void *)-1; /* so we can double check that an
                                        * event was returned
                                        */
 
     ret = port_getn(port, list, max, nget, tvptr);
     /* Note: 32-bit port_getn() on Solaris 10 x86 returns large negative 
      * values instead of 0 when returning immediately.
      */
 
     if (ret == -1) {
         rv = apr_get_netos_error();
 
         switch(rv) {
         case EINTR:
         case ETIME:
             if (*nget > 0 && list[0].portev_user != (void *)-1) {
                 /* This confusing API can return an event at the same time
                  * that it reports EINTR or ETIME.  If that occurs, just
                  * report the event.  With EINTR, nget can be > 0 without
                  * any event, so check that portev_user was filled in.
                  *
                  * (Maybe it will be simplified; see thread
                  *   http://mail.opensolaris.org
                  *   /pipermail/networking-discuss/2009-August/011979.html
                  *  This code will still work afterwards.)
                  */
                 rv = APR_SUCCESS;
                 break;
             }
             if (rv == ETIME) {
                 rv = APR_TIMEUP;
             }
         /* fall-through */
         default:
             *nget = 0;
         }
     }
     else if (*nget == 0) {
         rv = APR_TIMEUP;
     }
 
     return rv;
 }
 
 static apr_status_t impl_pollset_cleanup(apr_pollset_t *pollset)
 {
     close(pollset->p->port_fd);
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollset_create(apr_pollset_t *pollset,
                                              apr_uint32_t size,
                                              apr_pool_t *p,
                                              apr_uint32_t flags)
 {
     apr_status_t rv = APR_SUCCESS;
     pollset->p = apr_palloc(p, sizeof(apr_pollset_private_t));
 #if APR_HAS_THREADS
     if (flags & APR_POLLSET_THREADSAFE &&
         ((rv = apr_thread_mutex_create(&pollset->p->ring_lock,
                                        APR_THREAD_MUTEX_DEFAULT,
                                        p)) != APR_SUCCESS)) {
         pollset->p = NULL;
         return rv;
     }
 #else
     if (flags & APR_POLLSET_THREADSAFE) {
         pollset->p = NULL;
         return APR_ENOTIMPL;
     }
 #endif
     pollset->p->waiting = 0;
 
     pollset->p->port_set = apr_palloc(p, size * sizeof(port_event_t));
 
     pollset->p->port_fd = port_create();
 
     if (pollset->p->port_fd < 0) {
         pollset->p = NULL;
         return apr_get_netos_error();
     }
 
     {
         int flags;
 
         if ((flags = fcntl(pollset->p->port_fd, F_GETFD)) == -1) {
             rv = errno;
             close(pollset->p->port_fd);
             pollset->p = NULL;
             return rv;
         }
 
         flags |= FD_CLOEXEC;
         if (fcntl(pollset->p->port_fd, F_SETFD, flags) == -1) {
             rv = errno;
             close(pollset->p->port_fd);
             pollset->p = NULL;
             return rv;
         }
     }
 
     pollset->p->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
 
     APR_RING_INIT(&pollset->p->query_ring, pfd_elem_t, link);
     APR_RING_INIT(&pollset->p->add_ring, pfd_elem_t, link);
     APR_RING_INIT(&pollset->p->free_ring, pfd_elem_t, link);
     APR_RING_INIT(&pollset->p->dead_ring, pfd_elem_t, link);
 
     return rv;
 }
 
 static apr_status_t impl_pollset_add(apr_pollset_t *pollset,
                                      const apr_pollfd_t *descriptor)
 {
     apr_os_sock_t fd;
     pfd_elem_t *elem;
     int res;
     apr_status_t rv = APR_SUCCESS;
 
     pollset_lock_rings();
 
     if (!APR_RING_EMPTY(&(pollset->p->free_ring), pfd_elem_t, link)) {
         elem = APR_RING_FIRST(&(pollset->p->free_ring));
         APR_RING_REMOVE(elem, link);
     }
     else {
         elem = (pfd_elem_t *) apr_palloc(pollset->pool, sizeof(pfd_elem_t));
         APR_RING_ELEM_INIT(elem, link);
         elem->on_query_ring = 0;
     }
     elem->pfd = *descriptor;
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         fd = descriptor->desc.s->socketdes;
     }
     else {
         fd = descriptor->desc.f->filedes;
     }
 
     /* If another thread is polling, notify the kernel immediately; otherwise,
      * wait until the next call to apr_pollset_poll().
      */
     if (apr_atomic_read32(&pollset->p->waiting)) {
         res = port_associate(pollset->p->port_fd, PORT_SOURCE_FD, fd, 
                              get_event(descriptor->reqevents), (void *)elem);
 
         if (res < 0) {
             rv = apr_get_netos_error();
             APR_RING_INSERT_TAIL(&(pollset->p->free_ring), elem, pfd_elem_t, link);
         }
         else {
             elem->on_query_ring = 1;
             APR_RING_INSERT_TAIL(&(pollset->p->query_ring), elem, pfd_elem_t, link);
         }
     } 
     else {
         APR_RING_INSERT_TAIL(&(pollset->p->add_ring), elem, pfd_elem_t, link);
     }
 
     pollset_unlock_rings();
 
     return rv;
 }
 
 static apr_status_t impl_pollset_remove(apr_pollset_t *pollset,
                                         const apr_pollfd_t *descriptor)
 {
     apr_os_sock_t fd;
     pfd_elem_t *ep;
     apr_status_t rv = APR_SUCCESS;
     int res;
     int err = 0;
     int found;
 
     pollset_lock_rings();
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         fd = descriptor->desc.s->socketdes;
     }
     else {
         fd = descriptor->desc.f->filedes;
     }
 
     /* Search the add ring first.  This ring is often shorter,
      * and it often contains the descriptor being removed.  
      * (For the common scenario where apr_pollset_poll() 
      * returns activity for the descriptor and the descriptor
      * is then removed from the pollset, it will have just 
      * been moved to the add ring by apr_pollset_poll().)
      *
      * If it is on the add ring, it isn't associated with the
      * event port yet/anymore.
      */
     found = 0;
     for (ep = APR_RING_FIRST(&(pollset->p->add_ring));
          ep != APR_RING_SENTINEL(&(pollset->p->add_ring),
                                  pfd_elem_t, link);
          ep = APR_RING_NEXT(ep, link)) {
 
         if (descriptor->desc.s == ep->pfd.desc.s) {
             found = 1;
             APR_RING_REMOVE(ep, link);
             APR_RING_INSERT_TAIL(&(pollset->p->free_ring),
                                  ep, pfd_elem_t, link);
             break;
         }
     }
 
     if (!found) {
         res = port_dissociate(pollset->p->port_fd, PORT_SOURCE_FD, fd);
 
         if (res < 0) {
             /* The expected case for this failure is that another
              * thread's call to port_getn() returned this fd and
              * disassociated the fd from the event port, and 
              * impl_pollset_poll() is blocked on the ring lock,
              * which this thread holds.
              */
             err = errno;
             rv = APR_NOTFOUND;
         }
 
         for (ep = APR_RING_FIRST(&(pollset->p->query_ring));
              ep != APR_RING_SENTINEL(&(pollset->p->query_ring),
                                      pfd_elem_t, link);
              ep = APR_RING_NEXT(ep, link)) {
 
             if (descriptor->desc.s == ep->pfd.desc.s) {
                 APR_RING_REMOVE(ep, link);
                 ep->on_query_ring = 0;
                 APR_RING_INSERT_TAIL(&(pollset->p->dead_ring),
                                      ep, pfd_elem_t, link);
                 if (ENOENT == err) {
                     rv = APR_SUCCESS;
                 }
                 break;
             }
         }
     }
 
     pollset_unlock_rings();
 
     return rv;
 }
 
 static apr_status_t impl_pollset_poll(apr_pollset_t *pollset,
                                       apr_interval_time_t timeout,
                                       apr_int32_t *num,
                                       const apr_pollfd_t **descriptors)
 {
     apr_os_sock_t fd;
-    int ret, i, j;
-    unsigned int nget;
+    int ret;
+    unsigned int nget, i;
+    apr_int32_t j;
     pfd_elem_t *ep;
     apr_status_t rv = APR_SUCCESS;
-    apr_pollfd_t fp;
 
+    *num = 0;
     nget = 1;
 
     pollset_lock_rings();
 
     apr_atomic_inc32(&pollset->p->waiting);
 
     while (!APR_RING_EMPTY(&(pollset->p->add_ring), pfd_elem_t, link)) {
         ep = APR_RING_FIRST(&(pollset->p->add_ring));
         APR_RING_REMOVE(ep, link);
 
         if (ep->pfd.desc_type == APR_POLL_SOCKET) {
             fd = ep->pfd.desc.s->socketdes;
         }
         else {
             fd = ep->pfd.desc.f->filedes;
         }
 
         ret = port_associate(pollset->p->port_fd, PORT_SOURCE_FD, 
                              fd, get_event(ep->pfd.reqevents), ep);
         if (ret < 0) {
             rv = apr_get_netos_error();
             APR_RING_INSERT_TAIL(&(pollset->p->free_ring), ep, pfd_elem_t, link);
             break;
         }
 
         ep->on_query_ring = 1;
         APR_RING_INSERT_TAIL(&(pollset->p->query_ring), ep, pfd_elem_t, link);
     }
 
     pollset_unlock_rings();
 
     if (rv != APR_SUCCESS) {
         apr_atomic_dec32(&pollset->p->waiting);
         return rv;
     }
 
     rv = call_port_getn(pollset->p->port_fd, pollset->p->port_set, 
                         pollset->nalloc, &nget, timeout);
 
     /* decrease the waiting ASAP to reduce the window for calling 
        port_associate within apr_pollset_add() */
     apr_atomic_dec32(&pollset->p->waiting);
 
-    (*num) = nget;
-    if (nget) {
+    pollset_lock_rings();
 
-        pollset_lock_rings();
-
-        for (i = 0, j = 0; i < nget; i++) {
-            fp = (((pfd_elem_t*)(pollset->p->port_set[i].portev_user))->pfd);
-            if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
-                fp.desc_type == APR_POLL_FILE &&
-                fp.desc.f == pollset->wakeup_pipe[0]) {
-                apr_pollset_drain_wakeup_pipe(pollset);
-                rv = APR_EINTR;
-            }
-            else {
-                pollset->p->result_set[j] = fp;            
-                pollset->p->result_set[j].rtnevents =
-                    get_revent(pollset->p->port_set[i].portev_events);
-
-                /* If the ring element is still on the query ring, move it
-                 * to the add ring for re-association with the event port
-                 * later.  (It may have already been moved to the dead ring
-                 * by a call to pollset_remove on another thread.)
-                 */
-                ep = (pfd_elem_t *)pollset->p->port_set[i].portev_user;
-                if (ep->on_query_ring) {
-                    APR_RING_REMOVE(ep, link);
-                    ep->on_query_ring = 0;
-                    APR_RING_INSERT_TAIL(&(pollset->p->add_ring), ep,
-                                         pfd_elem_t, link);
-                }
-                j++;
-            }
+    for (i = 0, j = 0; i < nget; i++) {
+        ep = (pfd_elem_t *)pollset->p->port_set[i].portev_user;
+        if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
+            ep->pfd.desc_type == APR_POLL_FILE &&
+            ep->pfd.desc.f == pollset->wakeup_pipe[0]) {
+            apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe);
+            rv = APR_EINTR;
         }
-        pollset_unlock_rings();
-        if ((*num = j)) { /* any event besides wakeup pipe? */
-            rv = APR_SUCCESS;
-            if (descriptors) {
-                *descriptors = pollset->p->result_set;
-            }
+        else {
+            pollset->p->result_set[j] = ep->pfd;
+            pollset->p->result_set[j].rtnevents =
+                get_revent(pollset->p->port_set[i].portev_events);
+            j++;
         }
+        /* If the ring element is still on the query ring, move it
+         * to the add ring for re-association with the event port
+         * later.  (It may have already been moved to the dead ring
+         * by a call to pollset_remove on another thread.)
+         */
+        if (ep->on_query_ring) {
+            APR_RING_REMOVE(ep, link);
+            ep->on_query_ring = 0;
+            APR_RING_INSERT_TAIL(&(pollset->p->add_ring), ep,
+                                 pfd_elem_t, link);
+        }
     }
+    if ((*num = j)) { /* any event besides wakeup pipe? */
+        rv = APR_SUCCESS;
+        if (descriptors) {
+            *descriptors = pollset->p->result_set;
+        }
+    }
 
-    pollset_lock_rings();
-
     /* Shift all PFDs in the Dead Ring to the Free Ring */
     APR_RING_CONCAT(&(pollset->p->free_ring), &(pollset->p->dead_ring), pfd_elem_t, link);
 
     pollset_unlock_rings();
 
     return rv;
 }
 
-static apr_pollset_provider_t impl = {
+static const apr_pollset_provider_t impl = {
     impl_pollset_create,
     impl_pollset_add,
     impl_pollset_remove,
     impl_pollset_poll,
     impl_pollset_cleanup,
     "port"
 };
 
-apr_pollset_provider_t *apr_pollset_provider_port = &impl;
+const apr_pollset_provider_t *apr_pollset_provider_port = &impl;
 
-static apr_status_t cb_cleanup(void *p_)
+static apr_status_t impl_pollcb_cleanup(apr_pollcb_t *pollcb)
 {
-    apr_pollcb_t *pollcb = (apr_pollcb_t *) p_;
     close(pollcb->fd);
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollcb_create(apr_pollcb_t *pollcb,
                                        apr_uint32_t size,
                                        apr_pool_t *p,
                                        apr_uint32_t flags)
 {
     pollcb->fd = port_create();
 
     if (pollcb->fd < 0) {
         return apr_get_netos_error();
     }
 
     {
         int flags;
         apr_status_t rv;
 
         if ((flags = fcntl(pollcb->fd, F_GETFD)) == -1) {
             rv = errno;
             close(pollcb->fd);
             pollcb->fd = -1;
             return rv;
         }
 
         flags |= FD_CLOEXEC;
         if (fcntl(pollcb->fd, F_SETFD, flags) == -1) {
             rv = errno;
             close(pollcb->fd);
             pollcb->fd = -1;
             return rv;
         }
     }
 
     pollcb->pollset.port = apr_palloc(p, size * sizeof(port_event_t));
-    apr_pool_cleanup_register(p, pollcb, cb_cleanup, apr_pool_cleanup_null);
 
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollcb_add(apr_pollcb_t *pollcb,
                                     apr_pollfd_t *descriptor)
 {
     int ret, fd;
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         fd = descriptor->desc.s->socketdes;
     }
     else {
         fd = descriptor->desc.f->filedes;
     }
 
     ret = port_associate(pollcb->fd, PORT_SOURCE_FD, fd,
                          get_event(descriptor->reqevents), descriptor);
 
     if (ret == -1) {
         return apr_get_netos_error();
     }
 
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollcb_remove(apr_pollcb_t *pollcb,
                                        apr_pollfd_t *descriptor)
 {
     int fd, ret;
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         fd = descriptor->desc.s->socketdes;
     }
     else {
         fd = descriptor->desc.f->filedes;
     }
 
     ret = port_dissociate(pollcb->fd, PORT_SOURCE_FD, fd);
 
     if (ret < 0) {
         return APR_NOTFOUND;
     }
 
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollcb_poll(apr_pollcb_t *pollcb,
                                      apr_interval_time_t timeout,
                                      apr_pollcb_cb_t func,
                                      void *baton)
 {
-    apr_pollfd_t *pollfd;
     apr_status_t rv;
-    unsigned int i, nget = 1;
+    unsigned int nget = 1;
 
     rv = call_port_getn(pollcb->fd, pollcb->pollset.port, pollcb->nalloc,
                         &nget, timeout);
 
     if (nget) {
+        unsigned int i;
+
         for (i = 0; i < nget; i++) {
-            pollfd = (apr_pollfd_t *)(pollcb->pollset.port[i].portev_user);
+            apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset.port[i].portev_user);
+
+            if ((pollcb->flags & APR_POLLSET_WAKEABLE) &&
+                pollfd->desc_type == APR_POLL_FILE &&
+                pollfd->desc.f == pollcb->wakeup_pipe[0]) {
+                apr_poll_drain_wakeup_pipe(pollcb->wakeup_pipe);
+                return APR_EINTR;
+            }
+
             pollfd->rtnevents = get_revent(pollcb->pollset.port[i].portev_events);
 
             rv = func(baton, pollfd);
             if (rv) {
                 return rv;
             }
             rv = apr_pollcb_add(pollcb, pollfd);
         }
     }
 
     return rv;
 }
 
-static apr_pollcb_provider_t impl_cb = {
+static const apr_pollcb_provider_t impl_cb = {
     impl_pollcb_create,
     impl_pollcb_add,
     impl_pollcb_remove,
     impl_pollcb_poll,
+    impl_pollcb_cleanup,
     "port"
 };
 
-apr_pollcb_provider_t *apr_pollcb_provider_port = &impl_cb;
+const apr_pollcb_provider_t *apr_pollcb_provider_port = &impl_cb;
 
 #endif /* HAVE_PORT_CREATE */
Index: head/contrib/apr/poll/unix/select.c
===================================================================
--- head/contrib/apr/poll/unix/select.c	(revision 361677)
+++ head/contrib/apr/poll/unix/select.c	(revision 361678)
@@ -1,449 +1,449 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 WIN32
 /* POSIX defines 1024 for the FD_SETSIZE */
 #define FD_SETSIZE 1024
 #endif
 
 #include "apr.h"
 #include "apr_poll.h"
 #include "apr_time.h"
 #include "apr_portable.h"
 #include "apr_arch_file_io.h"
 #include "apr_arch_networkio.h"
 #include "apr_arch_poll_private.h"
 
 #ifdef POLL_USES_SELECT
 
 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
 
 #ifdef WIN32
     /* On Win32, select() must be presented with at least one socket to
      * poll on, or select() will return WSAEINVAL.  So, we'll just
      * short-circuit and bail now.
      */
     if (num == 0) {
         (*nsds) = 0;
         if (timeout > 0) {
             apr_sleep(timeout);
             return APR_TIMEUP;
         }
         return APR_SUCCESS;
     }
 #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();
     }
 
     (*nsds) = 0;
     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;
         }
         if (aprset[i].rtnevents) {
             (*nsds)++;
         }
     }
 
     return APR_SUCCESS;
 }
 
 #endif /* POLL_USES_SELECT */
 
 struct apr_pollset_private_t
 {
     fd_set readset, writeset, exceptset;
     int maxfd;
     apr_pollfd_t *query_set;
     apr_pollfd_t *result_set;
     apr_uint32_t flags;
 #ifdef NETWARE
     int set_type;
 #endif
 };
 
 static apr_status_t impl_pollset_create(apr_pollset_t *pollset,
                                         apr_uint32_t size,
                                         apr_pool_t *p,
                                         apr_uint32_t flags)
 {
     if (flags & APR_POLLSET_THREADSAFE) {                
         pollset->p = NULL;
         return APR_ENOTIMPL;
     }
 #ifdef FD_SETSIZE
     if (size > FD_SETSIZE) {
         pollset->p = NULL;
         return APR_EINVAL;
     }
 #endif
     pollset->p = apr_palloc(p, sizeof(apr_pollset_private_t));
     FD_ZERO(&(pollset->p->readset));
     FD_ZERO(&(pollset->p->writeset));
     FD_ZERO(&(pollset->p->exceptset));
     pollset->p->maxfd = 0;
 #ifdef NETWARE
     pollset->p->set_type = APR_NO_DESC;
 #endif
     pollset->p->query_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
     pollset->p->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
 
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollset_add(apr_pollset_t *pollset,
                                      const apr_pollfd_t *descriptor)
 {
     apr_os_sock_t fd;
 
     if (pollset->nelts == pollset->nalloc) {
         return APR_ENOMEM;
     }
 
     pollset->p->query_set[pollset->nelts] = *descriptor;
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
 #ifdef NETWARE
         /* NetWare can't handle mixed descriptor types in select() */
         if (HAS_PIPES(pollset->p->set_type)) {
             return APR_EBADF;
         }
         else {
             pollset->p->set_type = APR_POLL_SOCKET;
         }
 #endif
         fd = descriptor->desc.s->socketdes;
     }
     else {
 #if !APR_FILES_AS_SOCKETS
         if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
             descriptor->desc.f == pollset->wakeup_pipe[0])
             fd = (apr_os_sock_t)descriptor->desc.f->filedes;
         else
             return APR_EBADF;
 #else
 #ifdef NETWARE
         /* NetWare can't handle mixed descriptor types in select() */
         if (descriptor->desc.f->is_pipe && !HAS_SOCKETS(pollset->p->set_type)) {
             pollset->p->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->p->readset));
     }
     if (descriptor->reqevents & APR_POLLOUT) {
         FD_SET(fd, &(pollset->p->writeset));
     }
     if (descriptor->reqevents &
         (APR_POLLPRI | APR_POLLERR | APR_POLLHUP | APR_POLLNVAL)) {
         FD_SET(fd, &(pollset->p->exceptset));
     }
     if ((int) fd > pollset->p->maxfd) {
         pollset->p->maxfd = (int) fd;
     }
     pollset->nelts++;
     return APR_SUCCESS;
 }
 
 static apr_status_t impl_pollset_remove(apr_pollset_t * pollset,
                                         const apr_pollfd_t * descriptor)
 {
     apr_uint32_t i;
     apr_os_sock_t fd;
 
     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->p->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->p->query_set[i].desc.s) {
                     pollset->nelts--;
                 }
                 else {
                     pollset->p->query_set[dst] = pollset->p->query_set[i];
                     dst++;
                 }
             }
             FD_CLR(fd, &(pollset->p->readset));
             FD_CLR(fd, &(pollset->p->writeset));
             FD_CLR(fd, &(pollset->p->exceptset));
             if (((int) fd == pollset->p->maxfd) && (pollset->p->maxfd > 0)) {
                 pollset->p->maxfd--;
             }
             return APR_SUCCESS;
         }
     }
 
     return APR_NOTFOUND;
 }
 
 static apr_status_t impl_pollset_poll(apr_pollset_t *pollset,
                                       apr_interval_time_t timeout,
                                       apr_int32_t *num,
                                       const apr_pollfd_t **descriptors)
 {
     int rs;
     apr_uint32_t i, j;
     struct timeval tv, *tvptr;
     fd_set readset, writeset, exceptset;
     apr_status_t rv = APR_SUCCESS;
 
+    *num = 0;
+
 #ifdef WIN32
     /* On Win32, select() must be presented with at least one socket to
      * poll on, or select() will return WSAEINVAL.  So, we'll just
      * short-circuit and bail now.
      */
     if (pollset->nelts == 0) {
-        (*num) = 0;
         if (timeout > 0) {
             apr_sleep(timeout);
             return APR_TIMEUP;
         }
         return APR_SUCCESS;
     }
 #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;
     }
 
     memcpy(&readset, &(pollset->p->readset), sizeof(fd_set));
     memcpy(&writeset, &(pollset->p->writeset), sizeof(fd_set));
     memcpy(&exceptset, &(pollset->p->exceptset), sizeof(fd_set));
 
 #ifdef NETWARE
     if (HAS_PIPES(pollset->p->set_type)) {
         rs = pipe_select(pollset->p->maxfd + 1, &readset, &writeset, &exceptset,
                          tvptr);
     }
     else
 #endif
         rs = select(pollset->p->maxfd + 1, &readset, &writeset, &exceptset,
                     tvptr);
 
-    (*num) = rs;
     if (rs < 0) {
         return apr_get_netos_error();
     }
     if (rs == 0) {
         return APR_TIMEUP;
     }
     j = 0;
     for (i = 0; i < pollset->nelts; i++) {
         apr_os_sock_t fd;
         if (pollset->p->query_set[i].desc_type == APR_POLL_SOCKET) {
             fd = pollset->p->query_set[i].desc.s->socketdes;
         }
         else {
             if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
                 pollset->p->query_set[i].desc.f == pollset->wakeup_pipe[0]) {
-                apr_pollset_drain_wakeup_pipe(pollset);
+                apr_poll_drain_wakeup_pipe(pollset->wakeup_pipe);
                 rv = APR_EINTR;
                 continue;
             }
             else {
 #if !APR_FILES_AS_SOCKETS
                 return APR_EBADF;
 #else
                 fd = pollset->p->query_set[i].desc.f->filedes;
 #endif
             }
         }
         if (FD_ISSET(fd, &readset) || FD_ISSET(fd, &writeset) ||
             FD_ISSET(fd, &exceptset)) {
             pollset->p->result_set[j] = pollset->p->query_set[i];
             pollset->p->result_set[j].rtnevents = 0;
             if (FD_ISSET(fd, &readset)) {
                 pollset->p->result_set[j].rtnevents |= APR_POLLIN;
             }
             if (FD_ISSET(fd, &writeset)) {
                 pollset->p->result_set[j].rtnevents |= APR_POLLOUT;
             }
             if (FD_ISSET(fd, &exceptset)) {
                 pollset->p->result_set[j].rtnevents |= APR_POLLERR;
             }
             j++;
         }
     }
     if (((*num) = j) != 0)
         rv = APR_SUCCESS;
 
     if (descriptors)
         *descriptors = pollset->p->result_set;
     return rv;
 }
 
-static apr_pollset_provider_t impl = {
+static const apr_pollset_provider_t impl = {
     impl_pollset_create,
     impl_pollset_add,
     impl_pollset_remove,
     impl_pollset_poll,
     NULL,
     "select"
 };
 
-apr_pollset_provider_t *apr_pollset_provider_select = &impl;
+const apr_pollset_provider_t *apr_pollset_provider_select = &impl;
Index: head/contrib/apr/poll/unix/wakeup.c
===================================================================
--- head/contrib/apr/poll/unix/wakeup.c	(nonexistent)
+++ head/contrib/apr/poll/unix/wakeup.c	(revision 361678)
@@ -0,0 +1,151 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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_file_io.h"
+#include "apr_arch_networkio.h"
+#include "apr_arch_poll_private.h"
+#include "apr_arch_inherit.h"
+
+#if !APR_FILES_AS_SOCKETS
+
+#ifdef WIN32
+
+apr_status_t apr_poll_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd,
+                                         apr_file_t **wakeup_pipe)
+{
+    apr_status_t rv;
+
+    if ((rv = apr_file_socket_pipe_create(&wakeup_pipe[0], &wakeup_pipe[1],
+                                      pool)) != APR_SUCCESS)
+        return rv;
+
+    pfd->reqevents = APR_POLLIN;
+    pfd->desc_type = APR_POLL_FILE;
+    pfd->desc.f = wakeup_pipe[0];
+    return APR_SUCCESS;
+}
+
+apr_status_t apr_poll_close_wakeup_pipe(apr_file_t **wakeup_pipe)
+{
+    apr_status_t rv0 = APR_SUCCESS;
+    apr_status_t rv1 = APR_SUCCESS;
+
+    /* Close both sides of the wakeup pipe */
+    if (wakeup_pipe[0]) {
+        rv0 = apr_file_socket_pipe_close(wakeup_pipe[0]);
+        wakeup_pipe[0] = NULL;
+    }
+    if (wakeup_pipe[1]) {
+        rv1 = apr_file_socket_pipe_close(wakeup_pipe[1]);
+        wakeup_pipe[1] = NULL;
+    }
+    return rv0 ? rv0 : rv1;
+}
+
+#else /* !WIN32 */
+
+apr_status_t apr_poll_create_wakeup_pipe(apr_pollfd_t *pfd, apr_file_t **wakeup_pipe)
+{
+    return APR_ENOTIMPL;
+}
+
+apr_status_t apr_poll_close_wakeup_pipe(apr_file_t **wakeup_pipe)
+{
+    return APR_ENOTIMPL;
+}
+
+#endif /* !WIN32 */
+
+#else  /* APR_FILES_AS_SOCKETS */
+
+apr_status_t apr_poll_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd,
+                                         apr_file_t **wakeup_pipe)
+{
+    apr_status_t rv;
+
+    if ((rv = apr_file_pipe_create(&wakeup_pipe[0], &wakeup_pipe[1],
+                                   pool)) != APR_SUCCESS)
+        return rv;
+
+    pfd->p = pool;
+    pfd->reqevents = APR_POLLIN;
+    pfd->desc_type = APR_POLL_FILE;
+    pfd->desc.f = wakeup_pipe[0];
+
+    {
+        int flags;
+
+        if ((flags = fcntl(wakeup_pipe[0]->filedes, F_GETFD)) == -1)
+            return errno;
+
+        flags |= FD_CLOEXEC;
+        if (fcntl(wakeup_pipe[0]->filedes, F_SETFD, flags) == -1)
+            return errno;
+    }
+    {
+        int flags;
+
+        if ((flags = fcntl(wakeup_pipe[1]->filedes, F_GETFD)) == -1)
+            return errno;
+
+        flags |= FD_CLOEXEC;
+        if (fcntl(wakeup_pipe[1]->filedes, F_SETFD, flags) == -1)
+            return errno;
+    }
+
+    return APR_SUCCESS;
+}
+
+apr_status_t apr_poll_close_wakeup_pipe(apr_file_t **wakeup_pipe)
+{
+    apr_status_t rv0 = APR_SUCCESS;
+    apr_status_t rv1 = APR_SUCCESS;
+
+    /* Close both sides of the wakeup pipe */
+    if (wakeup_pipe[0]) {
+        rv0 = apr_file_close(wakeup_pipe[0]);
+        wakeup_pipe[0] = NULL;
+    }
+    if (wakeup_pipe[1]) {
+        rv1 = apr_file_close(wakeup_pipe[1]);
+        wakeup_pipe[1] = NULL;
+    }
+    return rv0 ? rv0 : rv1;
+}
+
+#endif /* APR_FILES_AS_SOCKETS */
+
+/* Read and discard whatever is in the wakeup pipe.
+ */
+void apr_poll_drain_wakeup_pipe(apr_file_t **wakeup_pipe)
+{
+    char rb[512];
+    apr_size_t nr = sizeof(rb);
+
+    while (apr_file_read(wakeup_pipe[0], rb, &nr) == APR_SUCCESS) {
+        /* Although we write just one byte to the other end of the pipe
+         * during wakeup, multiple threads could call the wakeup.
+         * So simply drain out from the input side of the pipe all
+         * the data.
+         */
+        if (nr != sizeof(rb))
+            break;
+    }
+}

Property changes on: head/contrib/apr/poll/unix/wakeup.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/apr/poll/unix/z_asio.c
===================================================================
--- head/contrib/apr/poll/unix/z_asio.c	(revision 361677)
+++ head/contrib/apr/poll/unix/z_asio.c	(revision 361678)
@@ -1,779 +1,782 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 implementation is based on a design by John Brooks (IBM Pok) which uses
  * the z/OS sockets async i/o facility.  When a
  * socket is added to the pollset, an async poll is issued for that individual
  * socket.  It specifies that the kernel should send an IPC message when the
  * socket becomes ready.  The IPC messages are sent to a single message queue
  * that is part of the pollset.  apr_pollset_poll waits on the arrival of IPC
  * messages or the specified timeout.
  *
  * Since z/OS does not support async i/o for pipes or files at present, this
  * implementation falls back to using ordinary poll() when
  * APR_POLLSET_THREADSAFE is unset.
  *
  * Greg Ames
  * April 2012
  */
 
 #include "apr.h"
 #include "apr_hash.h"
 #include "apr_poll.h"
 #include "apr_time.h"
 #include "apr_portable.h"
 #include "apr_arch_inherit.h"
 #include "apr_arch_file_io.h"
 #include "apr_arch_networkio.h"
 #include "apr_arch_poll_private.h"
 
 #ifdef HAVE_AIO_MSGQ
 
 #include <sys/msg.h>  	/* msgget etc   */
 #include <time.h>     	/* timestruct   */
 #include <poll.h>     	/* pollfd       */
 #include <limits.h>     /* MAX_INT      */
 
 struct apr_pollset_private_t
 {
     int             msg_q;              /* IPC message queue. The z/OS kernel sends messages
                                          * to this queue when our async polls on individual
                                          * file descriptors complete
                                          */
     apr_pollfd_t    *result_set;
     apr_uint32_t    size;
 
 #if APR_HAS_THREADS
     /* A thread mutex to protect operations on the rings and the hash */
     apr_thread_mutex_t *ring_lock;
 #endif
 
     /* A hash of all active elements used for O(1) _remove operations */
     apr_hash_t      *elems;
 
     APR_RING_HEAD(ready_ring_t,       asio_elem_t)      ready_ring;
     APR_RING_HEAD(prior_ready_ring_t, asio_elem_t)      prior_ready_ring;
     APR_RING_HEAD(free_ring_t,        asio_elem_t)      free_ring;
 
     /* for pipes etc with no asio */
     struct pollfd   *pollset;
     apr_pollfd_t    *query_set;
 };
 
 typedef enum {
     ASIO_INIT = 0,
     ASIO_REMOVED,
     ASIO_COMPLETE
 } asio_state_e;
 
 typedef struct asio_elem_t asio_elem_t;
 
 struct asio_msgbuf_t {
     long         msg_type;       /* must be > 0 */
     asio_elem_t *msg_elem;
 };
 
 struct asio_elem_t
 {
     APR_RING_ENTRY(asio_elem_t) link;
     apr_pollfd_t                pfd;
     struct pollfd               os_pfd;
     struct aiocb                a;
     asio_state_e                state;
     struct asio_msgbuf_t        msg;
 };
 
 #define DEBUG 0
 
 /* DEBUG settings: 0 - no debug messages at all,
  *                 1 - should not occur messages,
  *                 2 - apr_pollset_* entry and exit messages,
  *                 3 - state changes, memory usage,
  *                 4 - z/OS, APR, and internal calls,
  *                 5 - everything else except the timer pop path,
  *                 6 - everything, including the Event 1 sec timer pop path
  *
  *  each DEBUG level includes all messages produced by lower numbered levels
  */
 
 #if DEBUG
 
 #include <assert.h>
 #include <unistd.h>	/* getpid       */
 
 #define DBG_BUFF char dbg_msg_buff[256];
 
 #define DBG_TEST(lvl) if (lvl <= DEBUG) {
 
 #define DBG_CORE(msg)               sprintf(dbg_msg_buff, "% 8d " __FUNCTION__ \
                                         " "  msg, getpid()),                   \
                                     fprintf(stderr, "%s", dbg_msg_buff);
 #define DBG_CORE1(msg, var1)        sprintf(dbg_msg_buff, "% 8d " __FUNCTION__ \
                                         " " msg, getpid(), var1),              \
                                     fprintf(stderr, "%s", dbg_msg_buff);
 #define DBG_CORE2(msg, var1, var2)  sprintf(dbg_msg_buff, "% 8d " __FUNCTION__ \
                                         " " msg, getpid(), var1, var2),        \
                                     fprintf(stderr, "%s", dbg_msg_buff);
 #define DBG_CORE3(msg, var1, var2, var3)                                       \
                                     sprintf(dbg_msg_buff, "% 8d " __FUNCTION__ \
                                         " " msg, getpid(), var1, var2, var3),  \
                                     fprintf(stderr, "%s", dbg_msg_buff);
 #define DBG_CORE4(msg, var1, var2, var3, var4)                                 \
                                     sprintf(dbg_msg_buff, "% 8d " __FUNCTION__ \
                                         " " msg, getpid(), var1, var2, var3, var4),\
                                     fprintf(stderr, "%s", dbg_msg_buff);
 
 #define DBG_END }
 
 #define DBG(lvl, msg)   DBG_TEST(lvl)   \
                         DBG_CORE(msg)   \
                         DBG_END
 
 #define DBG1(lvl, msg, var1)    DBG_TEST(lvl)           \
                                 DBG_CORE1(msg, var1)    \
                                 DBG_END
 
 #define DBG2(lvl, msg, var1, var2)      DBG_TEST(lvl)               \
                                         DBG_CORE2(msg, var1, var2)  \
                                         DBG_END
 
 #define DBG3(lvl, msg, var1, var2, var3)                        \
                         DBG_TEST(lvl)                           \
                         DBG_CORE3(msg, var1, var2, var3)        \
                         DBG_END
 
 #define DBG4(lvl, msg, var1, var2, var3, var4)                  \
                         DBG_TEST(lvl)                           \
                         DBG_CORE4(msg, var1, var2, var3, var4)  \
                         DBG_END
 
 #else  /* DEBUG is 0 */
 #define DBG_BUFF
 #define DBG(lvl, msg)                            ((void)0)
 #define DBG1(lvl, msg, var1)                     ((void)0)
 #define DBG2(lvl, msg, var1, var2)               ((void)0)
 #define DBG3(lvl, msg, var1, var2, var3)         ((void)0)
 #define DBG4(lvl, msg, var1, var2, var3, var4)   ((void)0)
 
 #endif /* DEBUG */
 
 static int asyncio(struct aiocb *a)
 {
     DBG_BUFF
     int rv;
 
 #ifdef _LP64
 #define AIO BPX4AIO
 #else
 #define AIO BPX1AIO
 #endif
 
     AIO(sizeof(struct aiocb), a, &rv, &errno, __err2ad());
     DBG2(4, "BPX4AIO aiocb %p rv %d\n",
              a, rv);
 #ifdef DEBUG
     if (rv < 0) {
         DBG2(4, "errno %d errnojr %08x\n",
                  errno, *__err2ad());
     }
 #endif
     return rv;
 }
 
 static apr_int16_t get_event(apr_int16_t event)
 {
     DBG_BUFF
     apr_int16_t rv = 0;
     DBG(4, "entered\n");
 
     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;
 
     DBG(4, "exiting\n");
     return rv;
 }
 
 static apr_int16_t get_revent(apr_int16_t event)
 {
     DBG_BUFF
     apr_int16_t rv = 0;
     DBG(4, "entered\n");
 
     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;
 
     DBG(4, "exiting\n");
     return rv;
 }
 
 static apr_status_t asio_pollset_cleanup(apr_pollset_t *pollset)
 {
     DBG_BUFF
     int rv;
 
     DBG(4, "entered\n");
-    rv = msgctl(pollset->p->msg_q, IPC_RMID, NULL);
+    if (pollset->flags & APR_POLLSET_THREADSAFE) { 
+        rv = msgctl(pollset->p->msg_q, IPC_RMID, NULL);
+        DBG1(4, "asio_pollset_cleanup: msgctl(IPC_RMID) returned %d\n", rv);
+    }
 
-    DBG1(4, "exiting, msgctl(IPC_RMID) returned %d\n", rv);
     return rv;
 }
 
 static apr_status_t asio_pollset_create(apr_pollset_t *pollset,
                                         apr_uint32_t size,
                                         apr_pool_t *p,
                                         apr_uint32_t flags)
 {
     DBG_BUFF
     apr_status_t rv;
     apr_pollset_private_t *priv;
 
     DBG1(2, "entered, flags: %x\n", flags);
 
-    priv = pollset->p = apr_palloc(p, sizeof(*priv));
+    priv = pollset->p = apr_pcalloc(p, sizeof(*priv));
 
     if (flags & APR_POLLSET_THREADSAFE) {
 #if APR_HAS_THREADS
-        if (rv = apr_thread_mutex_create(&(priv->ring_lock),
+        if ((rv = apr_thread_mutex_create(&(priv->ring_lock),
                                            APR_THREAD_MUTEX_DEFAULT,
-                                           p) != APR_SUCCESS) {
+                                           p)) != APR_SUCCESS) {
             DBG1(1, "apr_thread_mutex_create returned %d\n", rv);
             pollset->p = NULL;
             return rv;
         }
         rv = msgget(IPC_PRIVATE, S_IWUSR+S_IRUSR); /* user r/w perms */
         if (rv < 0) {
 #if DEBUG
             perror(__FUNCTION__ " msgget returned < 0 ");
 #endif
             pollset->p = NULL;
             return rv;
         }
 
         DBG2(4, "pollset %p msgget was OK, rv=%d\n", pollset, rv);
         priv->msg_q = rv;
         priv->elems   = apr_hash_make(p);
 
         APR_RING_INIT(&priv->free_ring, asio_elem_t, link);
         APR_RING_INIT(&priv->prior_ready_ring, asio_elem_t, link);
 
 #else  /* APR doesn't have threads but caller wants a threadsafe pollset */
         pollset->p = NULL;
         return APR_ENOTIMPL;
 #endif
 
     } else {  /* APR_POLLSET_THREADSAFE not set, i.e. no async i/o,
                * init fields only needed in old style pollset
                */
 
         priv->pollset = apr_palloc(p, size * sizeof(struct pollfd));
         priv->query_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
 
         if ((!priv->pollset) || (!priv->query_set)) {
             pollset->p = NULL;
             return APR_ENOMEM;
         }
     }
 
     pollset->nelts   = 0;
     pollset->flags   = flags;
     pollset->pool    = p;
     priv->size    = size;
     priv->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
     if (!priv->result_set) {
         if (flags & APR_POLLSET_THREADSAFE) {
             msgctl(priv->msg_q, IPC_RMID, NULL);
         }
         pollset->p = NULL;
         return APR_ENOMEM;
     }
 
     DBG2(2, "exiting, pollset: %p, type: %s\n",
              pollset,
              flags & APR_POLLSET_THREADSAFE ? "async" : "POSIX");
 
 
     return APR_SUCCESS;
 
 } /* end of asio_pollset_create */
 
 static apr_status_t posix_add(apr_pollset_t      *pollset,
                               const apr_pollfd_t *descriptor)
 {
     DBG_BUFF
     int fd;
     apr_pool_t  *p = pollset->pool;
     apr_pollset_private_t *priv = pollset->p;
 
     DBG(4, "entered\n");
 
     if (pollset->nelts == priv->size) {
         return APR_ENOMEM;
     }
 
     priv->query_set[pollset->nelts] = *descriptor;
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         fd = descriptor->desc.s->socketdes;
     }
     else {
         fd = descriptor->desc.f->filedes;
     }
 
     priv->pollset[pollset->nelts].fd = fd;
 
     priv->pollset[pollset->nelts].events =
         get_event(descriptor->reqevents);
 
     pollset->nelts++;
 
     DBG2(4, "exiting, fd %d added to pollset %p\n", fd, pollset);
 
     return APR_SUCCESS;
 }   /* end of posix_add */
 
 
 static apr_status_t asio_pollset_add(apr_pollset_t *pollset,
                                      const apr_pollfd_t *descriptor)
 {
     DBG_BUFF
     asio_elem_t *elem;
     apr_status_t rv = APR_SUCCESS;
     apr_pollset_private_t *priv = pollset->p;
 
     pollset_lock_rings();
     DBG(2, "entered\n");
 
     if (pollset->flags & APR_POLLSET_THREADSAFE) {
 
         if (!APR_RING_EMPTY(&(priv->free_ring), asio_elem_t, link)) {
             elem = APR_RING_FIRST(&(priv->free_ring));
             APR_RING_REMOVE(elem, link);
             DBG1(3, "used recycled memory at %08p\n", elem);
             elem->state = ASIO_INIT;
             elem->a.aio_cflags = 0;
         }
         else {
             elem = (asio_elem_t *) apr_pcalloc(pollset->pool, sizeof(asio_elem_t));
             DBG1(3, "alloced new memory at %08p\n", elem);
 
             elem->a.aio_notifytype = AIO_MSGQ;
             elem->a.aio_msgev_qid  = priv->msg_q;
             DBG1(5, "aio_msgev_quid = %d \n", elem->a.aio_msgev_qid);
             elem->a.aio_msgev_size = sizeof(asio_elem_t *);
             elem->a.aio_msgev_flag = 0;     /* wait if queue is full */
             elem->a.aio_msgev_addr = &(elem->msg);
             elem->a.aio_buf        = &(elem->os_pfd);
             elem->a.aio_nbytes     = 1;     /* number of pfds to poll */
             elem->msg.msg_type     = 1;
             elem->msg.msg_elem     = elem;
         }
 
         /* z/OS only supports async I/O for sockets for now */
         elem->os_pfd.fd = descriptor->desc.s->socketdes;
 
         APR_RING_ELEM_INIT(elem, link);
         elem->a.aio_cmd       = AIO_SELPOLL;
         elem->a.aio_cflags    &= ~AIO_OK2COMPIMD; /* not OK to complete inline*/
         elem->pfd             = *descriptor;
         elem->os_pfd.events   = get_event(descriptor->reqevents);
 
         if (0 != asyncio(&elem->a)) {
             rv = errno;
             DBG3(4, "pollset %p asio failed fd %d, errno %p\n",
                      pollset, elem->os_pfd.fd, rv);
 #if DEBUG
             perror(__FUNCTION__ " asio failure");
 #endif
         }
         else {
             DBG2(4, "good asio call, adding fd %d to pollset %p\n",
                      elem->os_pfd.fd, pollset);
 
             pollset->nelts++;
             apr_hash_set(priv->elems, &(elem->os_pfd.fd), sizeof(int), elem);
         }
     }
     else {
         /* APR_POLLSET_THREADSAFE isn't set.  use POSIX poll in case
          * pipes or files are used with this pollset
          */
 
         rv = posix_add(pollset, descriptor);
     }
 
     DBG1(2, "exiting, rv = %d\n", rv);
 
     pollset_unlock_rings();
     return rv;
 } /* end of asio_pollset_add */
 
 static posix_remove(apr_pollset_t *pollset, const apr_pollfd_t *descriptor)
 {
     DBG_BUFF
     apr_uint32_t i;
     apr_pollset_private_t *priv = pollset->p;
 
     DBG(4, "entered\n");
     for (i = 0; i < pollset->nelts; i++) {
         if (descriptor->desc.s == priv->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 == priv->query_set[i].desc.s) {
                     pollset->nelts--;
                 }
                 else {
                     priv->pollset[dst] = priv->pollset[i];
                     priv->query_set[dst] = priv->query_set[i];
                     dst++;
                 }
             }
             DBG(4, "returning OK\n");
             return APR_SUCCESS;
         }
     }
 
     DBG(1, "returning APR_NOTFOUND\n");
     return APR_NOTFOUND;
 
 }   /* end of posix_remove */
 
 static apr_status_t asio_pollset_remove(apr_pollset_t *pollset,
                                         const apr_pollfd_t *descriptor)
 {
     DBG_BUFF
     asio_elem_t *elem;
     apr_status_t rv = APR_SUCCESS;
     apr_pollset_private_t *priv = pollset->p;
-    struct aiocb cancel_a;   /* AIO_CANCEL is synchronous, so autodata works fine */
+    /* AIO_CANCEL is synchronous, so autodata works fine.  */
+    struct aiocb cancel_a = {0};   
 
     int fd;
 
     DBG(2, "entered\n");
 
     if (!(pollset->flags & APR_POLLSET_THREADSAFE)) {
         return posix_remove(pollset, descriptor);
     }
 
     pollset_lock_rings();
 
 #if DEBUG
     assert(descriptor->desc_type == APR_POLL_SOCKET);
 #endif
     /* zOS 1.12 doesn't support files for async i/o */
     fd = descriptor->desc.s->socketdes;
 
     elem = apr_hash_get(priv->elems, &(fd), sizeof(int));
     if (elem == NULL) {
         DBG1(1, "couldn't find fd %d\n", fd);
         rv = APR_NOTFOUND;
     } else {
         DBG1(5, "hash found fd %d\n", fd);
         /* delete this fd from the hash */
         apr_hash_set(priv->elems, &(fd), sizeof(int), NULL);
 
         if (elem->state == ASIO_INIT) {
             /* asyncio call to cancel */
             cancel_a.aio_cmd = AIO_CANCEL;
             cancel_a.aio_buf = &elem->a;   /* point to original aiocb */
 
             cancel_a.aio_cflags  = 0;
             cancel_a.aio_cflags2 = 0;
 
             /* we want the original aiocb to show up on the pollset message queue 
              * before recycling its memory to eliminate race conditions
              */
 
             rv = asyncio(&cancel_a);
             DBG1(4, "asyncio returned %d\n", rv);
 
 #if DEBUG
             assert(rv == 1);
 #endif
         }
         elem->state = ASIO_REMOVED;
         rv = APR_SUCCESS;
     }
 
     DBG1(2, "exiting, rv: %d\n", rv);
 
     pollset_unlock_rings();
 
     return rv;
 }   /* end of asio_pollset_remove */
 
 static posix_poll(apr_pollset_t *pollset,
                   apr_interval_time_t timeout,
                   apr_int32_t *num,
                   const apr_pollfd_t **descriptors)
 {
     DBG_BUFF
     int rv;
     apr_uint32_t i, j;
     apr_pollset_private_t *priv = pollset->p;
 
     DBG(4, "entered\n");
 
     if (timeout > 0) {
         timeout /= 1000;
     }
     rv = poll(priv->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 (priv->pollset[i].revents != 0) {
             priv->result_set[j] = priv->query_set[i];
             priv->result_set[j].rtnevents =
                 get_revent(priv->pollset[i].revents);
             j++;
         }
     }
     if (descriptors)
         *descriptors = priv->result_set;
 
     DBG(4, "exiting ok\n");
     return APR_SUCCESS;
 
 }   /* end of posix_poll */
 
 static process_msg(apr_pollset_t *pollset, struct asio_msgbuf_t *msg)
 {
     DBG_BUFF
     asio_elem_t *elem = msg->msg_elem;
 
     switch(elem->state) {
     case ASIO_REMOVED:
         DBG2(5, "for cancelled elem, recycling memory - elem %08p, fd %d\n",
                 elem, elem->os_pfd.fd);
         APR_RING_INSERT_TAIL(&(pollset->p->free_ring), elem,
                              asio_elem_t, link);
         break;
     case ASIO_INIT:
         DBG2(4, "adding to ready ring: elem %08p, fd %d\n",
                 elem, elem->os_pfd.fd);
         elem->state = ASIO_COMPLETE;
         APR_RING_INSERT_TAIL(&(pollset->p->ready_ring), elem,
                              asio_elem_t, link);
         break;
     default:
         DBG3(1, "unexpected state: elem %08p, fd %d, state %d\n",
             elem, elem->os_pfd.fd, elem->state);
 #if DEBUG
         assert(0);
 #endif
     }
 }
 
 static apr_status_t asio_pollset_poll(apr_pollset_t *pollset,
                                       apr_interval_time_t timeout,
                                       apr_int32_t *num,
                                       const apr_pollfd_t **descriptors)
 {
     DBG_BUFF
     int i, ret;
     asio_elem_t *elem, *next_elem;
     struct asio_msgbuf_t msg_buff;
     struct timespec tv;
     apr_status_t rv = APR_SUCCESS;
     apr_pollset_private_t *priv = pollset->p;
 
     DBG(6, "entered\n"); /* chatty - traces every second w/Event */
 
     if ((pollset->flags & APR_POLLSET_THREADSAFE) == 0 ) {
         return posix_poll(pollset, timeout, num, descriptors);
     }
 
     pollset_lock_rings();
     APR_RING_INIT(&(priv->ready_ring), asio_elem_t, link);
 
     while (!APR_RING_EMPTY(&(priv->prior_ready_ring), asio_elem_t, link)) {
         elem = APR_RING_FIRST(&(priv->prior_ready_ring));
         DBG3(5, "pollset %p elem %p fd %d on prior ready ring\n",
                 pollset,
                 elem,
                 elem->os_pfd.fd);
 
         APR_RING_REMOVE(elem, link);
 
         /*
          * since USS does not remember what's in our pollset, we have
          * to re-add fds which have not been apr_pollset_remove'd
          *
          * there may have been too many ready fd's to return in the
          * result set last time. re-poll inline for both cases
          */
 
         if (elem->state == ASIO_REMOVED) {
 
             /* 
              * async i/o is done since it was found on prior_ready
              * the state says the caller is done with it too 
              * so recycle the elem 
              */
              
             APR_RING_INSERT_TAIL(&(priv->free_ring), elem,
                                  asio_elem_t, link);
             continue;  /* do not re-add if it has been _removed */
         }
 
         elem->state = ASIO_INIT;
         elem->a.aio_cflags     = AIO_OK2COMPIMD;
 
         if (0 != (ret = asyncio(&elem->a))) {
             if (ret == 1) {
                 DBG(4, "asyncio() completed inline\n");
                 /* it's ready now */
                 elem->state = ASIO_COMPLETE;
                 APR_RING_INSERT_TAIL(&(priv->ready_ring), elem, asio_elem_t,
                                      link);
             }
             else {
                 DBG2(1, "asyncio() failed, ret: %d, errno: %d\n",
                         ret, errno);
                 pollset_unlock_rings();
                 return errno;
             }
         }
         DBG1(4, "asyncio() completed rc %d\n", ret);
     }
 
     DBG(6, "after prior ready loop\n"); /* chatty w/timeouts, hence 6 */
 
     /* Gather async poll completions that have occurred since the last call */
     while (0 < msgrcv(priv->msg_q, &msg_buff, sizeof(asio_elem_t *), 0,
                       IPC_NOWAIT)) {
         process_msg(pollset, &msg_buff);
     }
 
     /* Suspend if nothing is ready yet. */
     if (APR_RING_EMPTY(&(priv->ready_ring), asio_elem_t, link)) {
 
         if (timeout >= 0) {
             tv.tv_sec  = apr_time_sec(timeout);
             tv.tv_nsec = apr_time_usec(timeout) * 1000;
         } else {
             tv.tv_sec = INT_MAX;  /* block until something is ready */
         }
 
         DBG2(6, "nothing on the ready ring "
                 "- blocking for %d seconds %d ns\n",
                 tv.tv_sec, tv.tv_nsec);
 
         pollset_unlock_rings();   /* allow other apr_pollset_* calls while blocked */
 
         if (0 >= (ret = __msgrcv_timed(priv->msg_q, &msg_buff,
                                        sizeof(asio_elem_t *), 0, NULL, &tv))) {
 #if DEBUG
             if (errno == EAGAIN) {
                 DBG(6, "__msgrcv_timed timed out\n"); /* timeout path, so 6 */
             }
             else {
                 DBG(1, "__msgrcv_timed failed!\n");
             }
 #endif
             return (errno == EAGAIN) ? APR_TIMEUP : errno;
         }
 
         pollset_lock_rings();
 
         process_msg(pollset, &msg_buff);
     }
 
     APR_RING_INIT(&priv->prior_ready_ring, asio_elem_t, link);
 
     (*num) = 0;
     elem = APR_RING_FIRST(&(priv->ready_ring));
 
     for (i = 0;
 
         i < priv->size
                 && elem != APR_RING_SENTINEL(&(priv->ready_ring), asio_elem_t, link);
         i++) {
              DBG2(5, "ready ring: elem %08p, fd %d\n", elem, elem->os_pfd.fd);
 
              priv->result_set[i] = elem->pfd;
              priv->result_set[i].rtnevents
                                     = get_revent(elem->os_pfd.revents);
              (*num)++;
 
              elem = APR_RING_NEXT(elem, link);
 
 #if DEBUG
              if (elem == APR_RING_SENTINEL(&(priv->ready_ring), asio_elem_t, link)) {
                  DBG(5, "end of ready ring reached\n");
              }
 #endif
     }
 
     if (descriptors) {
         *descriptors = priv->result_set;
     }
 
     /* if the result size is too small, remember which descriptors
      * haven't had results reported yet.  we will look
      * at these descriptors on the next apr_pollset_poll call
      */
 
     APR_RING_CONCAT(&priv->prior_ready_ring, &(priv->ready_ring), asio_elem_t, link);
 
     DBG1(2, "exiting, rv = %d\n", rv);
 
     pollset_unlock_rings();
 
     return rv;
 }  /* end of asio_pollset_poll */
 
-static apr_pollset_provider_t impl = {
+static const apr_pollset_provider_t impl = {
     asio_pollset_create,
     asio_pollset_add,
     asio_pollset_remove,
     asio_pollset_poll,
     asio_pollset_cleanup,
     "asio"
 };
 
-apr_pollset_provider_t *apr_pollset_provider_aio_msgq = &impl;
+const apr_pollset_provider_t *apr_pollset_provider_aio_msgq = &impl;
 
 #endif /* HAVE_AIO_MSGQ */
Index: head/contrib/apr/shmem/unix/shm.c
===================================================================
--- head/contrib/apr/shmem/unix/shm.c	(revision 361677)
+++ head/contrib/apr/shmem/unix/shm.c	(revision 361678)
@@ -1,700 +1,731 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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_arch_file_io.h"
 
 #include "apr_general.h"
 #include "apr_errno.h"
 #include "apr_user.h"
 #include "apr_strings.h"
 #include "apr_hash.h"
 
 #if APR_USE_SHMEM_MMAP_SHM
 /* 
  *   For portable use, a shared memory object should be identified by a name of
  *   the form /somename; that is, a null-terminated string of up to NAME_MAX
  *   (i.e., 255) characters consisting of an initial slash, followed by one or
  *   more characters, none of which are slashes.
  */
 #ifndef NAME_MAX
 #define NAME_MAX 255
 #endif
 
 /* See proc_mutex.c and sem_open for the reason for all this! */
 static unsigned int rshash (const char *p) {
     /* hash function from Robert Sedgwicks 'Algorithms in C' book */
     unsigned int b    = 378551;
     unsigned int a    = 63689;
     unsigned int retval = 0;
 
     for( ; *p; p++) {
         retval = retval * a + (*p);
         a *= b;
     }
 
     return retval;
 }
 
 static const char *make_shm_open_safe_name(const char *filename,
                                            apr_pool_t *pool)
 {
     apr_ssize_t flen;
     unsigned int h1, h2;
 
     if (filename == NULL) {
         return NULL;
     }
 
     flen = strlen(filename);
     h1 = (apr_hashfunc_default(filename, &flen) & 0xffffffff);
     h2 = (rshash(filename) & 0xffffffff);
     return apr_psprintf(pool, "/ShM.%xH%x", h1, h2);
 
 }
 #endif
 
 #if APR_USE_SHMEM_SHMGET
 static key_t our_ftok(const char *filename)
 {
     /* to help avoid collisions while still using
      * an easily recreated proj_id */
     apr_ssize_t slen = strlen(filename);
     return ftok(filename,
                 (int)apr_hashfunc_default(filename, &slen));
 }
 #endif
 
 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;
 #elif 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
         if (munmap(m->base, m->realsize) == -1) {
             return errno;
         }
         if (access(m->filename, F_OK)) {
             return APR_SUCCESS;
         }
         else {
             return apr_file_remove(m->filename, m->pool);
         }
 #elif APR_USE_SHMEM_MMAP_SHM
         if (munmap(m->base, m->realsize) == -1) {
             return errno;
         }
         if (shm_unlink(make_shm_open_safe_name(m->filename, m->pool)) == -1 && errno != ENOENT) {
             return errno;
         }
         return APR_SUCCESS;
 #elif APR_USE_SHMEM_SHMGET
         /* 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 && errno != EINVAL) {
             return errno;
         }
         if (shmdt(m->base) == -1) {
             return errno;
         }
         if (access(m->filename, F_OK)) {
             return APR_SUCCESS;
         }
         else {
             return apr_file_remove(m->filename, m->pool);
         }
 #else
         return APR_ENOTIMPL;
 #endif
     }
 }
 
 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));
         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 */
 #elif APR_USE_SHMEM_SHMGET_ANON
         new_m = apr_palloc(pool, sizeof(apr_shm_t));
         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,
+        new_m->shmkey = IPC_PRIVATE;
+        if ((new_m->shmid = shmget(new_m->shmkey, 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;
 #else
         /* 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 */
 #endif
     }
 
     /* Name-based shared memory */
     else {
         new_m = apr_palloc(pool, sizeof(apr_shm_t));
         new_m->pool = pool;
         new_m->reqsize = reqsize;
         new_m->filename = apr_pstrdup(pool, filename);
 #if APR_USE_SHMEM_MMAP_SHM
         const char *shm_name = make_shm_open_safe_name(filename, pool);
 #endif
 #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 && status != APR_ESPIPE) {
             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: SysV uses 0600... should we? */
         tmpfd = shm_open(shm_name, O_RDWR | O_CREAT | O_EXCL, 0644);
         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 && status != APR_ESPIPE) {
             shm_unlink(shm_name); /* we're failing, remove the object */
             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_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;
 
 #elif 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_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_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 = our_ftok(filename);
-        if (shmkey == (key_t)-1) {
+        new_m->shmkey = our_ftok(filename);
+        if (new_m->shmkey == (key_t)-1) {
             apr_file_close(file);
             return errno;
         }
 
-        if ((new_m->shmid = shmget(shmkey, new_m->realsize,
+        if ((new_m->shmid = shmget(new_m->shmkey, new_m->realsize,
                                    SHM_R | SHM_W | IPC_CREAT | IPC_EXCL)) < 0) {
             apr_file_close(file);
             return errno;
         }
 
         if ((new_m->base = shmat(new_m->shmid, NULL, 0)) == (void *)-1) {
             apr_file_close(file);
             return errno;
         }
         new_m->usable = new_m->base;
 
         if (shmctl(new_m->shmid, IPC_STAT, &shmbuf) == -1) {
             apr_file_close(file);
             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) {
             apr_file_close(file);
             return errno;
         }
 
         nbytes = sizeof(reqsize);
         status = apr_file_write(file, (const void *)&reqsize,
                                 &nbytes);
         if (status != APR_SUCCESS) {
             apr_file_close(file);
             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;
 
 #else
         return APR_ENOTIMPL;
 #endif
     }
 }
 
 APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m, 
                                             apr_size_t reqsize, 
                                             const char *filename, 
                                             apr_pool_t *p,
                                             apr_int32_t flags)
 {
     return apr_shm_create(m, reqsize, filename, p);
 }
 
 APR_DECLARE(apr_status_t) apr_shm_remove(const char *filename,
                                          apr_pool_t *pool)
 {
 #if APR_USE_SHMEM_SHMGET
     apr_status_t status;
     apr_file_t *file;  
     key_t shmkey;
     int shmid;
 #endif
 
 #if APR_USE_SHMEM_MMAP_TMP
     return apr_file_remove(filename, pool);
 #elif APR_USE_SHMEM_MMAP_SHM
     const char *shm_name = make_shm_open_safe_name(filename, pool);
     if (shm_unlink(shm_name) == -1) {
         return errno;
     }
     return APR_SUCCESS;
 #elif APR_USE_SHMEM_SHMGET
     /* Presume that the file already exists; just open for writing */    
     status = apr_file_open(&file, filename, APR_FOPEN_WRITE,
                            APR_OS_DEFAULT, pool);
     if (status) {
         return status;
     }
 
     /* ftok() (on solaris at least) requires that the file actually
      * exist before calling ftok(). */
     shmkey = our_ftok(filename);
     if (shmkey == (key_t)-1) {
         goto shm_remove_failed;
     }
 
     apr_file_close(file);
 
     if ((shmid = shmget(shmkey, 0, SHM_R | SHM_W)) < 0) {
         goto shm_remove_failed;
     }
 
     /* 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(shmid, IPC_RMID, NULL) == -1) {
         goto shm_remove_failed;
     }
     return apr_file_remove(filename, pool);
 
 shm_remove_failed:
     status = errno;
     /* ensure the file has been removed anyway. */
     apr_file_remove(filename, pool);
     return status;
 #else
 
     /* No support for anonymous shm */
     return APR_ENOTIMPL;
 #endif
 } 
 
+APR_DECLARE(apr_status_t) apr_shm_delete(apr_shm_t *m)
+{
+    if (m->filename) {
+        return apr_shm_remove(m->filename, m->pool);
+    }
+    else {
+        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;
 #elif APR_USE_SHMEM_SHMGET
         if (shmdt(m->base) == -1) {
             return errno;
         }
         return APR_SUCCESS;
 #else
         return APR_ENOTIMPL;
 #endif
     }
 }
 
 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));
         new_m->pool = pool;
         new_m->filename = apr_pstrdup(pool, filename);
 #if APR_USE_SHMEM_MMAP_SHM
         const char *shm_name = make_shm_open_safe_name(filename, pool);
 
         /* FIXME: SysV uses 0600... should we? */
         tmpfd = shm_open(shm_name, O_RDWR, 0644);
         if (tmpfd == -1) {
             return errno;
         }
 
         status = apr_os_file_put(&file, &tmpfd,
                                  APR_READ | APR_WRITE,
                                  pool); 
         if (status != APR_SUCCESS) {
             return status;
         }
 
 #elif APR_USE_SHMEM_MMAP_TMP
         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;
         }
 #else
         return APR_ENOTIMPL;
 #endif
 
         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;
 
 #elif 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));
 
         status = apr_file_open(&file, filename, 
                                APR_FOPEN_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 = our_ftok(filename);
-        if (shmkey == (key_t)-1) {
+        new_m->shmkey = our_ftok(filename);
+        if (new_m->shmkey == (key_t)-1) {
             return errno;
         }
-        if ((new_m->shmid = shmget(shmkey, 0, SHM_R | SHM_W)) == -1) {
+        if ((new_m->shmid = shmget(new_m->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;
 
 #else
         return APR_ENOTIMPL;
 #endif
     }
 }
 
 APR_DECLARE(apr_status_t) apr_shm_attach_ex(apr_shm_t **m,
                                             const char *filename,
                                             apr_pool_t *pool,
                                             apr_int32_t flags)
 {
     return apr_shm_attach(m, filename, pool);
 }
 
 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_PERMS_SET_IMPLEMENT(shm)
+{
+#if APR_USE_SHMEM_SHMGET || APR_USE_SHMEM_SHMGET_ANON
+    struct shmid_ds shmbuf;
+    int shmid;
+    apr_shm_t *m = (apr_shm_t *)theshm;
+
+    if ((shmid = shmget(m->shmkey, 0, SHM_R | SHM_W)) == -1) {
+        return errno;
+    }
+    shmbuf.shm_perm.uid  = uid;
+    shmbuf.shm_perm.gid  = gid;
+    shmbuf.shm_perm.mode = apr_unix_perms2mode(perms);
+    if (shmctl(shmid, IPC_SET, &shmbuf) == -1) {
+        return errno;
+    }
+    return APR_SUCCESS;
+#else
+    return APR_ENOTIMPL;
+#endif
 }
 
 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;
 }    
 
Index: head/contrib/apr/strings/apr_cpystrn.c
===================================================================
--- head/contrib/apr/strings/apr_cpystrn.c	(revision 361677)
+++ head/contrib/apr/strings/apr_cpystrn.c	(revision 361678)
@@ -1,313 +1,315 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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
  *   (4) If src is NULL, null terminate dst (empty string copy)
  *
  * 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 = dst, *end;
 
     if (dst_size == 0) {
         return (dst);
     }
 
     if (src) {
         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;
 }
 
 /* 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);
+    if (sdup == NULL)
+        return NULL;
     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
 
Index: head/contrib/apr/strings/apr_cstr.c
===================================================================
--- head/contrib/apr/strings/apr_cstr.c	(nonexistent)
+++ head/contrib/apr/strings/apr_cstr.c	(revision 361678)
@@ -0,0 +1,403 @@
+/*    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT 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_lib.h"
+#include "apr_strings.h"
+#include "apr_fnmatch.h"
+#if 0
+#define APR_WANT_STDIO
+#define APR_WANT_STRFUNC
+#endif
+#include "apr_want.h"
+#include "apr_cstr.h"
+
+APR_DECLARE(void) apr_cstr_split_append(apr_array_header_t *array,
+                                        const char *input,
+                                        const char *sep_chars,
+                                        int chop_whitespace,
+                                        apr_pool_t *pool)
+{
+  char *pats;
+  char *p;
+
+  pats = apr_pstrdup(pool, input);  /* strtok wants non-const data */
+  p = apr_cstr_tokenize(sep_chars, &pats);
+
+  while (p)
+    {
+      if (chop_whitespace)
+        {
+          while (apr_isspace(*p))
+            p++;
+
+          {
+            char *e = p + (strlen(p) - 1);
+            while ((e >= p) && (apr_isspace(*e)))
+              e--;
+            *(++e) = '\0';
+          }
+        }
+
+      if (p[0] != '\0')
+        APR_ARRAY_PUSH(array, const char *) = p;
+
+      p = apr_cstr_tokenize(sep_chars, &pats);
+    }
+
+  return;
+}
+
+
+APR_DECLARE(apr_array_header_t *) apr_cstr_split(const char *input,
+                                                 const char *sep_chars,
+                                                 int chop_whitespace,
+                                                 apr_pool_t *pool)
+{
+  apr_array_header_t *a = apr_array_make(pool, 5, sizeof(input));
+  apr_cstr_split_append(a, input, sep_chars, chop_whitespace, pool);
+  return a;
+}
+
+
+APR_DECLARE(int) apr_cstr_match_glob_list(const char *str,
+                                          const apr_array_header_t *list)
+{
+  int i;
+
+  for (i = 0; i < list->nelts; i++)
+    {
+      const char *this_pattern = APR_ARRAY_IDX(list, i, char *);
+
+      if (apr_fnmatch(this_pattern, str, 0) == APR_SUCCESS)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+APR_DECLARE(int) apr_cstr_match_list(const char *str,
+                                     const apr_array_header_t *list)
+{
+  int i;
+
+  for (i = 0; i < list->nelts; i++)
+    {
+      const char *this_str = APR_ARRAY_IDX(list, i, char *);
+
+      if (strcmp(this_str, str) == 0)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+APR_DECLARE(char *) apr_cstr_tokenize(const char *sep, char **str)
+{
+    char *token;
+    char *next;
+    char csep;
+
+    /* check parameters */
+    if ((sep == NULL) || (str == NULL) || (*str == NULL))
+        return NULL;
+
+    /* let APR handle edge cases and multiple separators */
+    csep = *sep;
+    if (csep == '\0' || sep[1] != '\0')
+      return apr_strtok(NULL, sep, str);
+
+    /* skip characters in sep (will terminate at '\0') */
+    token = *str;
+    while (*token == csep)
+        ++token;
+
+    if (!*token)          /* no more tokens */
+        return NULL;
+
+    /* skip valid token characters to terminate token and
+     * prepare for the next call (will terminate at '\0)
+     */
+    next = strchr(token, csep);
+    if (next == NULL)
+      {
+        *str = token + strlen(token);
+      }
+    else
+      {
+        *next = '\0';
+        *str = next + 1;
+      }
+
+    return token;
+}
+
+APR_DECLARE(int) apr_cstr_count_newlines(const char *msg)
+{
+  int count = 0;
+  const char *p;
+
+  for (p = msg; *p; p++)
+    {
+      if (*p == '\n')
+        {
+          count++;
+          if (*(p + 1) == '\r')
+            p++;
+        }
+      else if (*p == '\r')
+        {
+          count++;
+          if (*(p + 1) == '\n')
+            p++;
+        }
+    }
+
+  return count;
+}
+
+#if 0 /* XXX: stringbuf logic is not present in APR */
+APR_DECLARE(char *) apr_cstr_join(const apr_array_header_t *strings,
+                                  const char *separator,
+                                  apr_pool_t *pool)
+{
+  svn_stringbuf_t *new_str = svn_stringbuf_create_empty(pool);
+  size_t sep_len = strlen(separator);
+  int i;
+
+  for (i = 0; i < strings->nelts; i++)
+    {
+      const char *string = APR_ARRAY_IDX(strings, i, const char *);
+      svn_stringbuf_appendbytes(new_str, string, strlen(string));
+      svn_stringbuf_appendbytes(new_str, separator, sep_len);
+    }
+  return new_str->data;
+}
+#endif
+
+#if !APR_CHARSET_EBCDIC
+/*
+ * Our own known-fast translation table for casecmp by character.
+ * Only ASCII alpha characters 41-5A are folded to 61-7A, other
+ * octets (such as extended latin alphabetics) are never case-folded.
+ * NOTE: Other than Alpha A-Z/a-z, each code point is unique!
+ */
+static const short ucharmap[] = {
+    0x0,  0x1,  0x2,  0x3,  0x4,  0x5,  0x6,  0x7,
+    0x8,  0x9,  0xa,  0xb,  0xc,  0xd,  0xe,  0xf,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+    0x40,  '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', 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+    0x60,  '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', 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+    0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+    0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+    0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+    0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+    0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+    0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+    0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+    0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
+    0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+    0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
+#else /* APR_CHARSET_EBCDIC */
+/*
+ * Derived from apr-iconv/ccs/cp037.c for EBCDIC case comparison,
+ * provides unique identity of every char value (strict ISO-646
+ * conformance, arbitrary election of an ISO-8859-1 ordering, and
+ * very arbitrary control code assignments into C1 to achieve
+ * identity and a reversible mapping of code points),
+ * then folding the equivalences of ASCII 41-5A into 61-7A, 
+ * presenting comparison results in a somewhat ISO/IEC 10646
+ * (ASCII-like) order, depending on the EBCDIC code page in use.
+ *
+ * NOTE: Other than Alpha A-Z/a-z, each code point is unique!
+ */
+static const short ucharmap[] = {
+    0x00, 0x01, 0x02, 0x03, 0x9C, 0x09, 0x86, 0x7F,
+    0x97, 0x8D, 0x8E, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x9D, 0x85, 0x08, 0x87,
+    0x18, 0x19, 0x92, 0x8F, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x0A, 0x17, 0x1B,
+    0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x05, 0x06, 0x07,
+    0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04,
+    0x98, 0x99, 0x9A, 0x9B, 0x14, 0x15, 0x9E, 0x1A,
+    0x20, 0xA0, 0xE2, 0xE4, 0xE0, 0xE1, 0xE3, 0xE5,
+    0xE7, 0xF1, 0xA2, 0x2E, 0x3C, 0x28, 0x2B, 0x7C,
+    0x26, 0xE9, 0xEA, 0xEB, 0xE8, 0xED, 0xEE, 0xEF,
+    0xEC, 0xDF, 0x21, 0x24, 0x2A, 0x29, 0x3B, 0xAC,
+    0x2D, 0x2F, 0xC2, 0xC4, 0xC0, 0xC1, 0xC3, 0xC5,
+    0xC7, 0xD1, 0xA6, 0x2C, 0x25, 0x5F, 0x3E, 0x3F,
+    0xF8, 0xC9, 0xCA, 0xCB, 0xC8, 0xCD, 0xCE, 0xCF,
+    0xCC, 0x60, 0x3A, 0x23, 0x40, 0x27, 0x3D, 0x22,
+    0xD8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+    0x68, 0x69, 0xAB, 0xBB, 0xF0, 0xFD, 0xFE, 0xB1,
+    0xB0, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70,
+    0x71, 0x72, 0xAA, 0xBA, 0xE6, 0xB8, 0xC6, 0xA4,
+    0xB5, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+    0x79, 0x7A, 0xA1, 0xBF, 0xD0, 0xDD, 0xDE, 0xAE,
+    0x5E, 0xA3, 0xA5, 0xB7, 0xA9, 0xA7, 0xB6, 0xBC,
+    0xBD, 0xBE, 0x5B, 0x5D, 0xAF, 0xA8, 0xB4, 0xD7,
+    0x7B, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+    0x68, 0x69, 0xAD, 0xF4, 0xF6, 0xF2, 0xF3, 0xF5,
+    0x7D, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70,
+    0x71, 0x72, 0xB9, 0xFB, 0xFC, 0xF9, 0xFA, 0xFF,
+    0x5C, 0xF7, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+    0x79, 0x7A, 0xB2, 0xD4, 0xD6, 0xD2, 0xD3, 0xD5,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0xB3, 0xDB, 0xDC, 0xD9, 0xDA, 0x9F
+};
+#endif
+
+APR_DECLARE(int) apr_cstr_casecmp(const char *s1, const char *s2)
+{
+    const unsigned char *str1 = (const unsigned char *)s1;
+    const unsigned char *str2 = (const unsigned char *)s2;
+    for (;;)
+    {
+        const int c1 = (int)(*str1);
+        const int c2 = (int)(*str2);
+        const int cmp = ucharmap[c1] - ucharmap[c2];
+        /* Not necessary to test for !c2, this is caught by cmp */
+        if (cmp || !c1)
+            return cmp;
+        str1++;
+        str2++;
+    }
+}
+
+APR_DECLARE(int) apr_cstr_casecmpn(const char *s1, const char *s2, apr_size_t n)
+{
+    const unsigned char *str1 = (const unsigned char *)s1;
+    const unsigned char *str2 = (const unsigned char *)s2;
+    while (n--)
+    {
+        const int c1 = (int)(*str1);
+        const int c2 = (int)(*str2);
+        const int cmp = ucharmap[c1] - ucharmap[c2];
+        /* Not necessary to test for !c2, this is caught by cmp */
+        if (cmp || !c1)
+            return cmp;
+        str1++;
+        str2++;
+    }
+    return 0;
+}
+
+APR_DECLARE(apr_status_t) apr_cstr_strtoui64(apr_uint64_t *n, const char *str,
+                                apr_uint64_t minval, apr_uint64_t maxval,
+                                int base)
+{
+  apr_int64_t val;
+  char *endptr;
+
+  /* We assume errno is thread-safe. */
+  errno = 0; /* APR-0.9 doesn't always set errno */
+
+  /* ### We're throwing away half the number range here.
+   * ### APR needs a apr_strtoui64() function. */
+  val = apr_strtoi64(str, &endptr, base);
+  if (errno == EINVAL || endptr == str || str[0] == '\0' || *endptr != '\0')
+    return APR_EINVAL;
+  if ((errno == ERANGE && (val == APR_INT64_MIN || val == APR_INT64_MAX)) ||
+      val < 0 || (apr_uint64_t)val < minval || (apr_uint64_t)val > maxval)
+    return APR_ERANGE;
+  *n = val;
+  return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_cstr_atoui64(apr_uint64_t *n, const char *str)
+{
+  return apr_cstr_strtoui64(n, str, 0, APR_UINT64_MAX, 10);
+}
+
+APR_DECLARE(apr_status_t) apr_cstr_atoui(unsigned int *n, const char *str)
+{
+  apr_uint64_t val;
+  apr_status_t rv = apr_cstr_strtoui64(&val, str, 0, APR_UINT32_MAX, 10);
+  if (rv == APR_SUCCESS)
+    *n = (unsigned int)val;
+  return rv;
+}
+
+APR_DECLARE(apr_status_t) apr_cstr_strtoi64(apr_int64_t *n, const char *str,
+                               apr_int64_t minval, apr_int64_t maxval,
+                               int base)
+{
+  apr_int64_t val;
+  char *endptr;
+
+  /* We assume errno is thread-safe. */
+  errno = 0; /* APR-0.9 doesn't always set errno */
+
+  val = apr_strtoi64(str, &endptr, base);
+  if (errno == EINVAL || endptr == str || str[0] == '\0' || *endptr != '\0')
+    return APR_EINVAL;
+  if ((errno == ERANGE && (val == APR_INT64_MIN || val == APR_INT64_MAX)) ||
+      val < minval || val > maxval)
+    return APR_ERANGE;
+  *n = val;
+  return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_cstr_atoi64(apr_int64_t *n, const char *str)
+{
+  return apr_cstr_strtoi64(n, str, APR_INT64_MIN, APR_INT64_MAX, 10);
+}
+
+APR_DECLARE(apr_status_t) apr_cstr_atoi(int *n, const char *str)
+{
+  apr_int64_t val;
+  apr_status_t rv;
+
+  rv = apr_cstr_strtoi64(&val, str, APR_INT32_MIN, APR_INT32_MAX, 10);
+  if (rv == APR_SUCCESS)
+    *n = (int)val;
+  return rv;
+}
+
+APR_DECLARE(const char *) apr_cstr_skip_prefix(const char *str, 
+                                               const char *prefix)
+{
+  apr_size_t len = strlen(prefix);
+
+  if (strncmp(str, prefix, len) == 0)
+    {
+      return str + len;
+    }
+  else
+    {
+      return NULL;
+    }
+}

Property changes on: head/contrib/apr/strings/apr_cstr.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/contrib/apr/strings/apr_fnmatch.c
===================================================================
--- head/contrib/apr/strings/apr_fnmatch.c	(revision 361677)
+++ head/contrib/apr/strings/apr_fnmatch.c	(revision 361678)
@@ -1,482 +1,482 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements. See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
 
 
 /* Derived from The Open Group Base Specifications Issue 7, IEEE Std 1003.1-2008
  * as described in;
  *   http://pubs.opengroup.org/onlinepubs/9699919799/functions/fnmatch.html
  *
  * Filename pattern matches defined in section 2.13, "Pattern Matching Notation"
  * from chapter 2. "Shell Command Language"
  *   http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_13
  * where; 1. A bracket expression starting with an unquoted <circumflex> '^' 
  * character CONTINUES to specify a non-matching list; 2. an explicit <period> '.' 
  * in a bracket expression matching list, e.g. "[.abc]" does NOT match a leading 
  * <period> in a filename; 3. a <left-square-bracket> '[' which does not introduce
  * a valid bracket expression is treated as an ordinary character; 4. a differing
  * number of consecutive slashes within pattern and string will NOT match;
  * 5. a trailing '\' in FNM_ESCAPE mode is treated as an ordinary '\' character.
  *
  * Bracket expansion defined in section 9.3.5, "RE Bracket Expression",
  * from chapter 9, "Regular Expressions"
  *   http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_03_05
  * with no support for collating symbols, equivalence class expressions or 
  * character class expressions.  A partial range expression with a leading 
  * hyphen following a valid range expression will match only the ordinary
  * <hyphen> and the ending character (e.g. "[a-m-z]" will match characters 
  * 'a' through 'm', a <hyphen> '-', or a 'z').
  *
  * NOTE: Only POSIX/C single byte locales are correctly supported at this time.
  * Notably, non-POSIX locales with FNM_CASEFOLD produce undefined results,
  * particularly in ranges of mixed case (e.g. "[A-z]") or spanning alpha and
  * nonalpha characters within a range.
  *
  * XXX comments below indicate porting required for multi-byte character sets
  * and non-POSIX locale collation orders; requires mbr* APIs to track shift
  * state of pattern and string (rewinding pattern and string repeatedly).
  *
  * Certain parts of the code assume 0x00-0x3F are unique with any MBCS (e.g.
  * UTF-8, SHIFT-JIS, etc).  Any implementation allowing '\' as an alternate
  * path delimiter must be aware that 0x5C is NOT unique within SHIFT-JIS.
  */
 
 #include "apr_file_info.h"
 #include "apr_fnmatch.h"
 #include "apr_tables.h"
 #include "apr_lib.h"
 #include "apr_strings.h"
 #include <string.h>
 #if APR_HAVE_CTYPE_H
 # include <ctype.h>
 #endif
 
 
 /* Most MBCS/collation/case issues handled here.  Wildcard '*' is not handled.
  * EOS '\0' and the FNM_PATHNAME '/' delimiters are not advanced over, 
  * however the "\/" sequence is advanced to '/'.
  *
  * Both pattern and string are **char to support pointer increment of arbitrary
  * multibyte characters for the given locale, in a later iteration of this code
  */
 static APR_INLINE int fnmatch_ch(const char **pattern, const char **string, int flags)
 {
     const char * const mismatch = *pattern;
     const int nocase = !!(flags & APR_FNM_CASE_BLIND);
     const int escape = !(flags & APR_FNM_NOESCAPE);
     const int slash = !!(flags & APR_FNM_PATHNAME);
     int result = APR_FNM_NOMATCH;
     const char *startch;
     int negate;
 
     if (**pattern == '[')
     {
         ++*pattern;
 
         /* Handle negation, either leading ! or ^ operators (never both) */
         negate = ((**pattern == '!') || (**pattern == '^'));
         if (negate)
             ++*pattern;
 
         /* ']' is an ordinary character at the start of the range pattern */
         if (**pattern == ']')
             goto leadingclosebrace;
 
         while (**pattern)
         {
             if (**pattern == ']') {
                 ++*pattern;
                 /* XXX: Fix for MBCS character width */
                 ++*string;
                 return (result ^ negate);
             }
 
             if (escape && (**pattern == '\\')) {
                 ++*pattern;
 
                 /* Patterns must be terminated with ']', not EOS */
                 if (!**pattern)
                     break;
             }
 
             /* Patterns must be terminated with ']' not '/' */
             if (slash && (**pattern == '/'))
                 break;
 
 leadingclosebrace:
             /* Look at only well-formed range patterns; 
              * "x-]" is not allowed unless escaped ("x-\]")
              * XXX: Fix for locale/MBCS character width
              */
             if (((*pattern)[1] == '-') && ((*pattern)[2] != ']'))
             {
                 startch = *pattern;
                 *pattern += (escape && ((*pattern)[2] == '\\')) ? 3 : 2;
 
                 /* NOT a properly balanced [expr] pattern, EOS terminated 
                  * or ranges containing a slash in FNM_PATHNAME mode pattern
                  * fall out to to the rewind and test '[' literal code path
                  */
                 if (!**pattern || (slash && (**pattern == '/')))
                     break;
 
                 /* XXX: handle locale/MBCS comparison, advance by MBCS char width */
                 if ((**string >= *startch) && (**string <= **pattern))
                     result = 0;
                 else if (nocase && (isupper(**string) || isupper(*startch)
                                                       || isupper(**pattern))
                             && (tolower(**string) >= tolower(*startch)) 
                             && (tolower(**string) <= tolower(**pattern)))
                     result = 0;
 
                 ++*pattern;
                 continue;
             }
 
             /* XXX: handle locale/MBCS comparison, advance by MBCS char width */
             if ((**string == **pattern))
                 result = 0;
             else if (nocase && (isupper(**string) || isupper(**pattern))
                             && (tolower(**string) == tolower(**pattern)))
                 result = 0;
 
             ++*pattern;
         }
 
         /* NOT a properly balanced [expr] pattern; Rewind
          * and reset result to test '[' literal
          */
         *pattern = mismatch;
         result = APR_FNM_NOMATCH;
     }
     else if (**pattern == '?') {
         /* Optimize '?' match before unescaping **pattern */
         if (!**string || (slash && (**string == '/')))
             return APR_FNM_NOMATCH;
         result = 0;
         goto fnmatch_ch_success;
     }
     else if (escape && (**pattern == '\\') && (*pattern)[1]) {
         ++*pattern;
     }
 
     /* XXX: handle locale/MBCS comparison, advance by the MBCS char width */
     if (**string == **pattern)
         result = 0;
     else if (nocase && (isupper(**string) || isupper(**pattern))
                     && (tolower(**string) == tolower(**pattern)))
         result = 0;
 
     /* Refuse to advance over trailing slash or nulls
      */
     if (!**string || !**pattern || (slash && ((**string == '/') || (**pattern == '/'))))
         return result;
 
 fnmatch_ch_success:
     ++*pattern;
     ++*string;
     return result;
 }
 
 
 APR_DECLARE(int) apr_fnmatch(const char *pattern, const char *string, int flags)
 {
     static const char dummystring[2] = {' ', 0};
     const int escape = !(flags & APR_FNM_NOESCAPE);
     const int slash = !!(flags & APR_FNM_PATHNAME);
     const char *strendseg;
     const char *dummyptr;
     const char *matchptr;
     int wild;
     /* For '*' wild processing only; surpress 'used before initialization'
      * warnings with dummy initialization values;
      */
     const char *strstartseg = NULL;
     const char *mismatch = NULL;
     int matchlen = 0;
 
     if (*pattern == '*')
         goto firstsegment;
 
     while (*pattern && *string)
     {
         /* Pre-decode "\/" which has no special significance, and
          * match balanced slashes, starting a new segment pattern
          */
         if (slash && escape && (*pattern == '\\') && (pattern[1] == '/'))
             ++pattern;
         if (slash && (*pattern == '/') && (*string == '/')) {
             ++pattern;
             ++string;
         }            
 
 firstsegment:
         /* At the beginning of each segment, validate leading period behavior.
          */
         if ((flags & APR_FNM_PERIOD) && (*string == '.'))
         {
             if (*pattern == '.')
                 ++pattern;
             else if (escape && (*pattern == '\\') && (pattern[1] == '.'))
                 pattern += 2;
             else
                 return APR_FNM_NOMATCH;
             ++string;
         }
 
         /* Determine the end of string segment
          *
          * Presumes '/' character is unique, not composite in any MBCS encoding
          */
         if (slash) {
             strendseg = strchr(string, '/');
             if (!strendseg)
                 strendseg = strchr(string, '\0');
         }
         else {
             strendseg = strchr(string, '\0');
         }
 
         /* Allow pattern '*' to be consumed even with no remaining string to match
          */
         while (*pattern)
         {
             if ((string > strendseg)
                 || ((string == strendseg) && (*pattern != '*')))
                 break;
 
             if (slash && ((*pattern == '/')
                            || (escape && (*pattern == '\\')
                                       && (pattern[1] == '/'))))
                 break;
 
             /* Reduce groups of '*' and '?' to n '?' matches
              * followed by one '*' test for simplicity
              */
             for (wild = 0; ((*pattern == '*') || (*pattern == '?')); ++pattern)
             {
                 if (*pattern == '*') {
                     wild = 1;
                 }
                 else if (string < strendseg) {  /* && (*pattern == '?') */
                     /* XXX: Advance 1 char for MBCS locale */
                     ++string;
                 }
                 else {  /* (string >= strendseg) && (*pattern == '?') */
                     return APR_FNM_NOMATCH;
                 }
             }
 
             if (wild)
             {
                 strstartseg = string;
                 mismatch = pattern;
 
                 /* Count fixed (non '*') char matches remaining in pattern
                  * excluding '/' (or "\/") and '*'
                  */
                 for (matchptr = pattern, matchlen = 0; 1; ++matchlen)
                 {
                     if ((*matchptr == '\0') 
                         || (slash && ((*matchptr == '/')
                                       || (escape && (*matchptr == '\\')
                                                  && (matchptr[1] == '/')))))
                     {
                         /* Compare precisely this many trailing string chars,
                          * the resulting match needs no wildcard loop
                          */
                         /* XXX: Adjust for MBCS */
                         if (string + matchlen > strendseg)
                             return APR_FNM_NOMATCH;
 
                         string = strendseg - matchlen;
                         wild = 0;
                         break;
                     }
 
                     if (*matchptr == '*')
                     {
                         /* Ensure at least this many trailing string chars remain
                          * for the first comparison
                          */
                         /* XXX: Adjust for MBCS */
                         if (string + matchlen > strendseg)
                             return APR_FNM_NOMATCH;
 
                         /* Begin first wild comparison at the current position */
                         break;
                     }
 
                     /* Skip forward in pattern by a single character match
                      * Use a dummy fnmatch_ch() test to count one "[range]" escape
                      */ 
                     /* XXX: Adjust for MBCS */
                     if (escape && (*matchptr == '\\') && matchptr[1]) {
                         matchptr += 2;
                     }
                     else if (*matchptr == '[') {
                         dummyptr = dummystring;
                         fnmatch_ch(&matchptr, &dummyptr, flags);
                     }
                     else {
                         ++matchptr;
                     }
                 }
             }
 
             /* Incrementally match string against the pattern
              */
             while (*pattern && (string < strendseg))
             {
                 /* Success; begin a new wild pattern search
                  */
                 if (*pattern == '*')
                     break;
 
                 if (slash && ((*string == '/')
                               || (*pattern == '/')
                               || (escape && (*pattern == '\\')
                                          && (pattern[1] == '/'))))
                     break;
 
                 /* Compare ch's (the pattern is advanced over "\/" to the '/',
                  * but slashes will mismatch, and are not consumed)
                  */
                 if (!fnmatch_ch(&pattern, &string, flags))
                     continue;
 
                 /* Failed to match, loop against next char offset of string segment 
                  * until not enough string chars remain to match the fixed pattern
                  */
                 if (wild) {
                     /* XXX: Advance 1 char for MBCS locale */
                     string = ++strstartseg;
                     if (string + matchlen > strendseg)
                         return APR_FNM_NOMATCH;
 
                     pattern = mismatch;
                     continue;
                 }
                 else
                     return APR_FNM_NOMATCH;
             }
         }
 
         if (*string && !(slash && (*string == '/')))
             return APR_FNM_NOMATCH;
 
         if (*pattern && !(slash && ((*pattern == '/')
                                     || (escape && (*pattern == '\\')
                                                && (pattern[1] == '/')))))
             return APR_FNM_NOMATCH;
     }
 
     /* Where both pattern and string are at EOS, declare success
      */
     if (!*string && !*pattern)
         return 0;
 
     /* pattern didn't match to the end of string */
     return APR_FNM_NOMATCH;
 }
 
 
 /* This function is an Apache addition
  * return non-zero if pattern has any glob chars in it
  * @bug Function does not distinguish for FNM_PATHNAME mode, which renders
  * a false positive for test[/]this (which is not a range, but 
  * seperate test[ and ]this segments and no glob.)
  * @bug Function does not distinguish for non-FNM_ESCAPE mode.
  * @bug Function does not parse []] correctly
  * Solution may be to use fnmatch_ch() to walk the patterns?
  */
 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;
 }
 
 
 /* Find all files matching the specified pattern */
 APR_DECLARE(apr_status_t) apr_match_glob(const char *pattern, 
                                          apr_array_header_t **result,
                                          apr_pool_t *p)
 {
     apr_dir_t *dir;
     apr_finfo_t finfo;
     apr_status_t rv;
     char *path;
 
     /* XXX So, this is kind of bogus.  Basically, I need to strip any leading
      * directories off the pattern, but there is no portable way to do that.
      * So, for now we just find the last occurance of '/' and if that doesn't
      * return anything, then we look for '\'.  This means that we could
      * screw up on unix if the pattern is something like "foo\.*"  That '\'
      * isn't a directory delimiter, it is a part of the filename.  To fix this,
      * we really need apr_filepath_basename, which will be coming as soon as
      * I get to it.  rbb
      */
     char *idx = strrchr(pattern, '/');
     
     if (idx == NULL) {
         idx = strrchr(pattern, '\\');
     }
     if (idx == NULL) {
         path = ".";
     }
     else {
-        path = apr_pstrndup(p, pattern, idx - pattern);
+        path = apr_pstrmemdup(p, pattern, idx - pattern);
         pattern = idx + 1;
     }
 
     *result = apr_array_make(p, 0, sizeof(char *));
     rv = apr_dir_open(&dir, path, p);
     if (rv != APR_SUCCESS) {
         return rv;
     }
 
     while (apr_dir_read(&finfo, APR_FINFO_NAME, dir) == APR_SUCCESS) {
         if (apr_fnmatch(pattern, finfo.name, 0) == APR_SUCCESS) {
             *(const char **)apr_array_push(*result) = apr_pstrdup(p, finfo.name);
         }
     }
     apr_dir_close(dir);
     return APR_SUCCESS;
 }
Index: head/contrib/apr/strings/apr_snprintf.c
===================================================================
--- head/contrib/apr/strings/apr_snprintf.c	(revision 361677)
+++ head/contrib/apr/strings/apr_snprintf.c	(revision 361678)
@@ -1,1408 +1,1407 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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 "apr_errno.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'
 
 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) {                                   \
         apr_size_t p = (precision + 1 < NUM_BUF_SIZE) \
                      ? 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 apr_int32_t num, register int is_unsigned,
                      register int *is_negative, char *buf_end,
                      register apr_size_t *len)
 {
     register char *p = buf_end;
     register apr_uint32_t magnitude = num;
 
     if (is_unsigned) {
         *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) {
             apr_int32_t t = num + 1;
             magnitude = ((apr_uint32_t) -t) + 1;
         }
     }
 
     /*
      * We use a do-while loop so that we write at least 1 digit 
      */
     do {
         register apr_uint32_t 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(apr_int64_t num, register int is_unsigned,
                      register int *is_negative, char *buf_end,
                      register apr_size_t *len)
 {
     register char *p = buf_end;
     apr_uint64_t magnitude = num;
 
     /*
      * 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 ((magnitude <= APR_UINT32_MAX && is_unsigned)
         || (num <= APR_INT32_MAX && num >= APR_INT32_MIN && !is_unsigned))
             return(conv_10((apr_int32_t)num, is_unsigned, is_negative, buf_end, len));
 
     if (is_unsigned) {
         *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) {
             apr_int64_t t = num + 1;
             magnitude = ((apr_uint64_t) -t) + 1;
         }
     }
 
     /*
      * We use a do-while loop so that we write at least 1 digit 
      */
     do {
         apr_uint64_t 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, apr_size_t *len)
 {
     unsigned addr = ntohl(ia->s_addr);
     char *p = buf_end;
     int is_negative;
     apr_size_t 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);
 }
 
 
 /* Must be passed a buffer of size NUM_BUF_SIZE where buf_end points
  * to 1 byte past the end of the buffer. */
 static char *conv_apr_sockaddr(apr_sockaddr_t *sa, char *buf_end, apr_size_t *len)
 {
     char *p = buf_end;
     int is_negative;
     apr_size_t sub_len;
     char *ipaddr_str;
 
     p = conv_10(sa->port, TRUE, &is_negative, p, &sub_len);
     *--p = ':';
     ipaddr_str = buf_end - NUM_BUF_SIZE;
     if (apr_sockaddr_ip_getbuf(ipaddr_str, sa->addr_str_len, sa)) {
         /* Should only fail if the buffer is too small, which it
          * should not be; but fail safe anyway: */
         *--p = '?';
         *len = buf_end - p;
         return p;
     }
     sub_len = strlen(ipaddr_str);
 #if APR_HAVE_IPV6
     if (sa->family == APR_INET6 &&
         !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, apr_size_t *len)
 {
     union {
         apr_os_thread_t tid;
         apr_uint64_t u64;
         apr_uint32_t u32;
     } u;
     int is_negative;
 
     u.tid = *tid;
     switch(sizeof(u.tid)) {
     case sizeof(apr_int32_t):
         return conv_10(u.u32, TRUE, &is_negative, buf_end, len);
     case sizeof(apr_int64_t):
         return conv_10_quad(u.u64, 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, int *is_negative,
     char *buf, apr_size_t *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 */
         apr_size_t t_len;
         int exponent_is_negative;
 
         *s++ = format;                /* either e or E */
         decimal_point--;
         if (decimal_point != 0) {
             p = conv_10((apr_int32_t) 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 apr_uint32_t num, register int nbits,
                      char format, char *buf_end, register apr_size_t *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(apr_uint64_t num, register int nbits,
                      char format, char *buf_end, register apr_size_t *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 <= APR_UINT32_MAX)
         return(conv_p2((apr_uint32_t)num, nbits, format, buf_end, len));
 
     do {
         *--p = digits[num & mask];
         num >>= nbits;
     }
     while (num);
 
     *len = buf_end - p;
     return (p);
 }
 
 #if APR_HAS_THREADS
 static char *conv_os_thread_t_hex(apr_os_thread_t *tid, char *buf_end, apr_size_t *len)
 {
     union {
         apr_os_thread_t tid;
         apr_uint64_t u64;
         apr_uint32_t u32;
     } u;
     int is_negative;
 
     u.tid = *tid;
     switch(sizeof(u.tid)) {
     case sizeof(apr_int32_t):
         return conv_p2(u.u32, 4, 'x', buf_end, len);
     case sizeof(apr_int64_t):
         return conv_p2_quad(u.u64, 4, 'x', buf_end, len);
     default:
         /* not implemented; stick 0 in the buffer */
         return conv_10(0, TRUE, &is_negative, buf_end, len);
     }
 }
 #endif
 
 /*
  * 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 apr_size_t i;
 
     register char *s = NULL;
     char *q;
     apr_size_t s_len = 0;
 
     register apr_size_t min_width = 0;
     apr_size_t precision = 0;
     enum {
         LEFT, RIGHT
     } adjust;
     char pad_char;
     char prefix_char;
 
     double fp_num;
     apr_int64_t i_quad = 0;
     apr_uint64_t ui_quad;
     apr_int32_t i_num = 0;
     apr_uint32_t ui_num = 0;
 
     char num_buf[NUM_BUF_SIZE];
     char char_buf[2];                /* for printing %% and %<unknown> */
     char buf[5];                     /* for printing %B, %F, and %S */
 
     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;
     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 == '*') {
                     int v = va_arg(ap, int);
                     fmt++;
                     adjust_width = YES;
                     if (v < 0) {
                         adjust = LEFT;
                         min_width = (apr_size_t)(-v);
                     }
                     else
                         min_width = (apr_size_t)v;
                 }
                 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 == '*') {
                         int v = va_arg(ap, int);
                         fmt++;
                         precision = (v < 0) ? 0 : (apr_size_t)v;
                     }
                     else
                         precision = 0;
                 }
                 else
                     adjust_precision = NO;
             }
             else
                 adjust_precision = adjust_width = NO;
 
             /*
              * Modifier check.  In same cases, APR_OFF_T_FMT can be
              * "lld" and APR_INT64_T_FMT can be "ld" (that is, off_t is
              * "larger" than int64). Check that case 1st.
              * Note that if APR_OFF_T_FMT is "d",
              * the first if condition is never true. If APR_INT64_T_FMT
              * is "d' then the second if condition is never true.
              */
             if ((sizeof(APR_OFF_T_FMT) > sizeof(APR_INT64_T_FMT)) &&
                 ((sizeof(APR_OFF_T_FMT) == 4 &&
                  fmt[0] == APR_OFF_T_FMT[0] &&
                  fmt[1] == APR_OFF_T_FMT[1]) ||
                 (sizeof(APR_OFF_T_FMT) == 3 &&
                  fmt[0] == APR_OFF_T_FMT[0]) ||
                 (sizeof(APR_OFF_T_FMT) > 4 &&
                  strncmp(fmt, APR_OFF_T_FMT, 
                          sizeof(APR_OFF_T_FMT) - 2) == 0))) {
                 /* Need to account for trailing 'd' and null in sizeof() */
                 var_type = IS_QUAD;
                 fmt += (sizeof(APR_OFF_T_FMT) - 2);
             }
             else if ((sizeof(APR_INT64_T_FMT) == 4 &&
                  fmt[0] == APR_INT64_T_FMT[0] &&
                  fmt[1] == APR_INT64_T_FMT[1]) ||
                 (sizeof(APR_INT64_T_FMT) == 3 &&
                  fmt[0] == APR_INT64_T_FMT[0]) ||
                 (sizeof(APR_INT64_T_FMT) > 4 &&
                  strncmp(fmt, APR_INT64_T_FMT, 
                          sizeof(APR_INT64_T_FMT) - 2) == 0)) {
                 /* 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, apr_uint64_t);
                     s = conv_10_quad(i_quad, 1, &is_negative,
                             &num_buf[NUM_BUF_SIZE], &s_len);
                 }
                 else {
                     if (var_type == IS_LONG)
                         i_num = (apr_int32_t) va_arg(ap, apr_uint32_t);
                     else if (var_type == IS_SHORT)
                         i_num = (apr_int32_t) (unsigned short) va_arg(ap, unsigned int);
                     else
                         i_num = (apr_int32_t) 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, apr_int64_t);
                     s = conv_10_quad(i_quad, 0, &is_negative,
                             &num_buf[NUM_BUF_SIZE], &s_len);
                 }
                 else {
                     if (var_type == IS_LONG)
                         i_num = va_arg(ap, apr_int32_t);
                     else if (var_type == IS_SHORT)
                         i_num = (short) va_arg(ap, int);
                     else
                         i_num = 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, apr_uint64_t);
                     s = conv_p2_quad(ui_quad, 3, *fmt,
                             &num_buf[NUM_BUF_SIZE], &s_len);
                 }
                 else {
                     if (var_type == IS_LONG)
                         ui_num = va_arg(ap, apr_uint32_t);
                     else if (var_type == IS_SHORT)
                         ui_num = (unsigned short) va_arg(ap, unsigned int);
                     else
                         ui_num = 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, apr_uint64_t);
                     s = conv_p2_quad(ui_quad, 4, *fmt,
                             &num_buf[NUM_BUF_SIZE], &s_len);
                 }
                 else {
                     if (var_type == IS_LONG)
                         ui_num = va_arg(ap, apr_uint32_t);
                     else if (var_type == IS_SHORT)
                         ui_num = (unsigned short) va_arg(ap, unsigned int);
                     else
                         ui_num = 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 && ui_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,
                                 (int)((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), (int) 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, apr_int64_t *)) = 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(apr_uint64_t)) {
                         ui_quad = (apr_uint64_t) va_arg(ap, void *);
                         s = conv_p2_quad(ui_quad, 4, 'x',
                                 &num_buf[NUM_BUF_SIZE], &s_len);
                     }
 #else
                     if (sizeof(void *) <= sizeof(apr_uint32_t)) {
                         ui_num = (apr_uint32_t) 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;
 
                 /* print the error for an apr_status_t */
                 case 'm':
                 {
                     apr_status_t *mrv;
 
                     mrv = va_arg(ap, apr_status_t *);
                     if (mrv != NULL) {
                         s = apr_strerror(*mrv, num_buf, NUM_BUF_SIZE-1);
                         s_len = strlen(s);
                     }
                     else {
                         s = S_NULL;
                         s_len = S_NULL_LEN;
                     }
                     pad_char = ' ';
                 }
                 break;
 
                 case 'T':
 #if APR_HAS_THREADS
                 {
                     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 '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_hex(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 'B':
                 case 'F':
                 case 'S':
                 {
                     apr_off_t size = 0;
 
                     if (*fmt == 'B') {
                         apr_uint32_t *arg = va_arg(ap, apr_uint32_t *);
                         size = (arg) ? *arg : 0;
                     }
                     else if (*fmt == 'F') {
                         apr_off_t *arg = va_arg(ap, apr_off_t *);
                         size = (arg) ? *arg : 0;
                     }
                     else {
                         apr_size_t *arg = va_arg(ap, apr_size_t *);
                         size = (arg) ? *arg : 0;
                     }
 
                     s = apr_strfsize(size, buf);
                     s_len = strlen(s);
                     pad_char = ' ';
                 }
                 break;
 
                 case NUL:
                     /* if %p ends the string, oh well ignore it */
                     continue;
 
                 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);
+                    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 - 1 : 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 - 1 : cc;
 }
Index: head/contrib/apr/tables/apr_skiplist.c
===================================================================
--- head/contrib/apr/tables/apr_skiplist.c	(revision 361677)
+++ head/contrib/apr/tables/apr_skiplist.c	(revision 361678)
@@ -1,721 +1,852 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 /*
  * Modified to use APR and APR pools.
  *  TODO: Is malloc() better? Will long running skiplists grow too much?
  *  Keep the skiplist_alloc() and skiplist_free() until we know
  *  Yeah, if using pools it means some bogus cycles for checks
  *  (and an useless function call for skiplist_free) which we
  *  can removed if/when needed.
  */
 
 #include "apr_skiplist.h"
 
 typedef struct {
     apr_skiplistnode **data;
     size_t size, pos;
     apr_pool_t *p;
 } apr_skiplist_q; 
 
 struct apr_skiplist {
     apr_skiplist_compare compare;
     apr_skiplist_compare comparek;
     int height;
     int preheight;
     size_t size;
     apr_skiplistnode *top;
     apr_skiplistnode *bottom;
     /* These two are needed for appending */
     apr_skiplistnode *topend;
     apr_skiplistnode *bottomend;
     apr_skiplist *index;
     apr_array_header_t *memlist;
     apr_skiplist_q nodes_q,
                    stack_q;
     apr_pool_t *pool;
 };
 
 struct apr_skiplistnode {
     void *data;
     apr_skiplistnode *next;
     apr_skiplistnode *prev;
     apr_skiplistnode *down;
     apr_skiplistnode *up;
     apr_skiplistnode *previndex;
     apr_skiplistnode *nextindex;
     apr_skiplist *sl;
 };
 
 static int get_b_rand(void)
 {
     static int ph = 32;         /* More bits than we will ever use */
     static int randseq;
     if (ph > 31) {              /* Num bits in return of rand() */
         ph = 0;
         randseq = rand();
     }
     return randseq & (1 << ph++);
 }
 
 typedef struct {
     size_t size;
     apr_array_header_t *list;
 } memlist_t;
 
 typedef struct {
     void *ptr;
     char inuse;
 } chunk_t;
 
 APR_DECLARE(void *) apr_skiplist_alloc(apr_skiplist *sl, size_t size)
 {
     if (sl->pool) {
         void *ptr;
         int found_size = 0;
         int i;
         chunk_t *newchunk;
         memlist_t *memlist = (memlist_t *)sl->memlist->elts;
         for (i = 0; i < sl->memlist->nelts; i++) {
             if (memlist->size == size) {
                 int j;
                 chunk_t *chunk = (chunk_t *)memlist->list->elts;
                 found_size = 1;
                 for (j = 0; j < memlist->list->nelts; j++) {
                     if (!chunk->inuse) {
                         chunk->inuse = 1;
                         return chunk->ptr;
                     }
                     chunk++;
                 }
                 break; /* no free of this size; punt */
             }
             memlist++;
         }
         /* no free chunks */
         ptr = apr_palloc(sl->pool, size);
         if (!ptr) {
             return ptr;
         }
         /*
          * is this a new sized chunk? If so, we need to create a new
          * array of them. Otherwise, re-use what we already have.
          */
         if (!found_size) {
             memlist = apr_array_push(sl->memlist);
             memlist->size = size;
             memlist->list = apr_array_make(sl->pool, 20, sizeof(chunk_t));
         }
         newchunk = apr_array_push(memlist->list);
         newchunk->ptr = ptr;
         newchunk->inuse = 1;
         return ptr;
     }
     else {
         return malloc(size);
     }
 }
 
 APR_DECLARE(void) apr_skiplist_free(apr_skiplist *sl, void *mem)
 {
     if (!sl->pool) {
         free(mem);
     }
     else {
         int i;
         memlist_t *memlist = (memlist_t *)sl->memlist->elts;
         for (i = 0; i < sl->memlist->nelts; i++) {
             int j;
             chunk_t *chunk = (chunk_t *)memlist->list->elts;
             for (j = 0; j < memlist->list->nelts; j++) {
                 if (chunk->ptr == mem) {
                     chunk->inuse = 0;
                     return;
                 }
                 chunk++;
             }
             memlist++;
         }
     }
 }
 
 static apr_status_t skiplist_qpush(apr_skiplist_q *q, apr_skiplistnode *m)
 {
     if (q->pos >= q->size) {
         apr_skiplistnode **data;
         size_t size = (q->pos) ? q->pos * 2 : 32;
         if (q->p) {
             data = apr_palloc(q->p, size * sizeof(*data));
             if (data) {
                 memcpy(data, q->data, q->pos * sizeof(*data));
             }
         }
         else {
             data = realloc(q->data, size * sizeof(*data));
         }
         if (!data) {
             return APR_ENOMEM;
         }
         q->data = data;
         q->size = size;
     }
     q->data[q->pos++] = m;
     return APR_SUCCESS;
 }
 
 static APR_INLINE apr_skiplistnode *skiplist_qpop(apr_skiplist_q *q)
 {
     return (q->pos > 0) ? q->data[--q->pos] : NULL;
 }
 
 static APR_INLINE void skiplist_qclear(apr_skiplist_q *q)
 {
     q->pos = 0;
 }
 
 static apr_skiplistnode *skiplist_new_node(apr_skiplist *sl)
 {
     apr_skiplistnode *m = skiplist_qpop(&sl->nodes_q);
     if (!m) {
         if (sl->pool) {
             m = apr_palloc(sl->pool, sizeof *m);
         }
         else {
             m = malloc(sizeof *m);
         }
     }
     return m;
 }
 
-static apr_status_t skiplist_free_node(apr_skiplist *sl, apr_skiplistnode *m)
+static apr_status_t skiplist_put_node(apr_skiplist *sl, apr_skiplistnode *m)
 {
     return skiplist_qpush(&sl->nodes_q, m);
 }
 
 static apr_status_t skiplisti_init(apr_skiplist **s, apr_pool_t *p)
 {
     apr_skiplist *sl;
     if (p) {
         sl = apr_pcalloc(p, sizeof(apr_skiplist));
         sl->memlist = apr_array_make(p, 20, sizeof(memlist_t));
         sl->pool = sl->nodes_q.p = sl->stack_q.p = p;
     }
     else {
         sl = calloc(1, sizeof(apr_skiplist));
         if (!sl) {
             return APR_ENOMEM;
         }
     }
     *s = sl;
     return APR_SUCCESS;
 }
 
 static int indexing_comp(void *a, void *b)
 {
     void *ac = (void *) (((apr_skiplist *) a)->compare);
     void *bc = (void *) (((apr_skiplist *) b)->compare);
     return ((ac < bc) ? -1 : ((ac > bc) ? 1 : 0));
 }
 
 static int indexing_compk(void *ac, void *b)
 {
     void *bc = (void *) (((apr_skiplist *) b)->compare);
     return ((ac < bc) ? -1 : ((ac > bc) ? 1 : 0));
 }
 
 APR_DECLARE(apr_status_t) apr_skiplist_init(apr_skiplist **s, apr_pool_t *p)
 {
     apr_skiplist *sl;
     skiplisti_init(s, p);
     sl = *s;
     skiplisti_init(&(sl->index), p);
     apr_skiplist_set_compare(sl->index, indexing_comp, indexing_compk);
     return APR_SUCCESS;
 }
 
 APR_DECLARE(void) apr_skiplist_set_compare(apr_skiplist *sl,
                           apr_skiplist_compare comp,
                           apr_skiplist_compare compk)
 {
     if (sl->compare && sl->comparek) {
         apr_skiplist_add_index(sl, comp, compk);
     }
     else {
         sl->compare = comp;
         sl->comparek = compk;
     }
 }
 
 APR_DECLARE(void) apr_skiplist_add_index(apr_skiplist *sl,
                         apr_skiplist_compare comp,
                         apr_skiplist_compare compk)
 {
     apr_skiplistnode *m;
     apr_skiplist *ni;
     int icount = 0;
     apr_skiplist_find(sl->index, (void *)comp, &m);
     if (m) {
         return;                 /* Index already there! */
     }
     skiplisti_init(&ni, sl->pool);
     apr_skiplist_set_compare(ni, comp, compk);
     /* Build the new index... This can be expensive! */
     m = apr_skiplist_insert(sl->index, ni);
     while (m->prev) {
         m = m->prev;
         icount++;
     }
     for (m = apr_skiplist_getlist(sl); m; apr_skiplist_next(sl, &m)) {
         int j = icount - 1;
         apr_skiplistnode *nsln;
         nsln = apr_skiplist_insert(ni, m->data);
         /* skip from main index down list */
         while (j > 0) {
             m = m->nextindex;
             j--;
         }
         /* insert this node in the indexlist after m */
         nsln->nextindex = m->nextindex;
         if (m->nextindex) {
             m->nextindex->previndex = nsln;
         }
         nsln->previndex = m;
         m->nextindex = nsln;
     }
 }
 
 static int skiplisti_find_compare(apr_skiplist *sl, void *data,
-                           apr_skiplistnode **ret,
-                           apr_skiplist_compare comp)
+                                  apr_skiplistnode **ret,
+                                  apr_skiplist_compare comp,
+                                  int last)
 {
     int count = 0;
-    apr_skiplistnode *m;
-    m = sl->top;
-    while (m) {
+    apr_skiplistnode *m, *found = NULL;
+    for (m = sl->top; m; count++) {
         if (m->next) {
             int compared = comp(data, m->next->data);
             if (compared == 0) {
-                m = m->next;
-                while (m->down) {
-                    m = m->down;
+                found = m = m->next;
+                if (!last) {
+                    break;
                 }
-                *ret = m;
-                return count;
+                continue;
             }
             if (compared > 0) {
                 m = m->next;
-                count++;
                 continue;
             }
         }
         m = m->down;
-        count++;
     }
-    *ret = NULL;
+    if (found) {
+        while (found->down) {
+            found = found->down;
+        }
+        *ret = found;
+    }
+    else {
+        *ret = NULL;
+    }
     return count;
 }
 
-APR_DECLARE(void *) apr_skiplist_find_compare(apr_skiplist *sli, void *data,
-                               apr_skiplistnode **iter,
-                               apr_skiplist_compare comp)
+static void *find_compare(apr_skiplist *sli, void *data,
+                          apr_skiplistnode **iter,
+                          apr_skiplist_compare comp,
+                          int last)
 {
     apr_skiplistnode *m;
     apr_skiplist *sl;
     if (!comp) {
         if (iter) {
             *iter = NULL;
         }
         return NULL;
     }
     if (comp == sli->compare || !sli->index) {
         sl = sli;
     }
     else {
         apr_skiplist_find(sli->index, (void *)comp, &m);
         if (!m) {
             if (iter) {
                 *iter = NULL;
             }
             return NULL;
         }
         sl = (apr_skiplist *) m->data;
     }
-    skiplisti_find_compare(sl, data, &m, sl->comparek);
+    skiplisti_find_compare(sl, data, &m, sl->comparek, last);
     if (iter) {
         *iter = m;
     }
     return (m) ? m->data : NULL;
 }
 
+APR_DECLARE(void *) apr_skiplist_find_compare(apr_skiplist *sl, void *data,
+                                              apr_skiplistnode **iter,
+                                              apr_skiplist_compare comp)
+{
+    return find_compare(sl, data, iter, comp, 0);
+}
+
 APR_DECLARE(void *) apr_skiplist_find(apr_skiplist *sl, void *data, apr_skiplistnode **iter)
 {
-    return apr_skiplist_find_compare(sl, data, iter, sl->compare);
+    return find_compare(sl, data, iter, sl->compare, 0);
 }
 
+APR_DECLARE(void *) apr_skiplist_last_compare(apr_skiplist *sl, void *data,
+                                              apr_skiplistnode **iter,
+                                              apr_skiplist_compare comp)
+{
+    return find_compare(sl, data, iter, comp, 1);
+}
 
+APR_DECLARE(void *) apr_skiplist_last(apr_skiplist *sl, void *data,
+                                      apr_skiplistnode **iter)
+{
+    return find_compare(sl, data, iter, sl->compare, 1);
+}
+
+
 APR_DECLARE(apr_skiplistnode *) apr_skiplist_getlist(apr_skiplist *sl)
 {
     if (!sl->bottom) {
         return NULL;
     }
     return sl->bottom->next;
 }
 
 APR_DECLARE(void *) apr_skiplist_next(apr_skiplist *sl, apr_skiplistnode **iter)
 {
     if (!*iter) {
         return NULL;
     }
     *iter = (*iter)->next;
     return (*iter) ? ((*iter)->data) : NULL;
 }
 
 APR_DECLARE(void *) apr_skiplist_previous(apr_skiplist *sl, apr_skiplistnode **iter)
 {
     if (!*iter) {
         return NULL;
     }
     *iter = (*iter)->prev;
     return (*iter) ? ((*iter)->data) : NULL;
 }
 
+APR_DECLARE(void *) apr_skiplist_element(apr_skiplistnode *iter)
+{
+    return (iter) ? iter->data : NULL;
+}
+
+/* forward declared */
+static int skiplisti_remove(apr_skiplist *sl, apr_skiplistnode *m,
+                            apr_skiplist_freefunc myfree);
+
 static APR_INLINE int skiplist_height(const apr_skiplist *sl)
 {
     /* Skiplists (even empty) always have a top node, although this
      * implementation defers its creation until the first insert, or
      * deletes it with the last remove. We want the real height here.
      */
     return sl->height ? sl->height : 1;
 }
 
-APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert_compare(apr_skiplist *sl, void *data,
-                                      apr_skiplist_compare comp)
+static apr_skiplistnode *insert_compare(apr_skiplist *sl, void *data,
+                                        apr_skiplist_compare comp, int add,
+                                        apr_skiplist_freefunc myfree)
 {
     apr_skiplistnode *m, *p, *tmp, *ret = NULL;
-    int ch, nh = 1;
+    int ch, top_nh, nh = 1;
 
-    if (!comp) {
-        return NULL;
-    }
-
     ch = skiplist_height(sl);
     if (sl->preheight) {
         while (nh < sl->preheight && get_b_rand()) {
             nh++;
         }
     }
     else {
         while (nh <= ch && get_b_rand()) {
             nh++;
         }
     }
+    top_nh = nh;
 
     /* Now we have in nh the height at which we wish to insert our new node,
      * and in ch the current height: don't create skip paths to the inserted
      * element until the walk down through the tree (which decrements ch)
      * reaches nh. From there, any walk down pushes the current node on a
      * stack (the node(s) after which we would insert) to pop back through
      * for insertion later.
      */
     m = sl->top;
     while (m) {
+        /*
+         * To maintain stability, dups (compared == 0) must be added
+         * AFTER each other.
+         */
         if (m->next) {
             int compared = comp(data, m->next->data);
             if (compared == 0) {
-                /* Keep the existing element(s) */
-                skiplist_qclear(&sl->stack_q);
-                return NULL;
+                if (!add) {
+                    /* Keep the existing element(s) */
+                    skiplist_qclear(&sl->stack_q);
+                    return NULL;
+                }
+                if (add < 0) {
+                    /* Remove this element and continue with the next node
+                     * or the new top if the current one is also removed.
+                     */
+                    apr_skiplistnode *top = sl->top;
+                    skiplisti_remove(sl, m->next, myfree);
+                    if (top != sl->top) {
+                        m = sl->top;
+                        skiplist_qclear(&sl->stack_q);
+                        ch = skiplist_height(sl);
+                        nh = top_nh;
+                    }
+                    continue;
+                }
             }
-            if (compared > 0) {
+            if (compared >= 0) {
                 m = m->next;
                 continue;
             }
         }
         if (ch <= nh) {
             /* push on stack */
             skiplist_qpush(&sl->stack_q, m);
         }
         m = m->down;
         ch--;
     }
     /* Pop the stack and insert nodes */
     p = NULL;
     while ((m = skiplist_qpop(&sl->stack_q))) {
         tmp = skiplist_new_node(sl);
         tmp->next = m->next;
         if (m->next) {
             m->next->prev = tmp;
         }
         m->next = tmp;
         tmp->prev = m;
         tmp->up = NULL;
         tmp->nextindex = tmp->previndex = NULL;
         tmp->down = p;
         if (p) {
             p->up = tmp;
         }
         else {
             /* This sets ret to the bottom-most node we are inserting */
             ret = tmp;
         }
         tmp->data = data;
         tmp->sl = sl;
         p = tmp;
     }
 
     /* Now we are sure the node is inserted, grow our tree to 'nh' tall */
     for (; sl->height < nh; sl->height++) {
         m = skiplist_new_node(sl);
         tmp = skiplist_new_node(sl);
         m->up = m->prev = m->nextindex = m->previndex = NULL;
         m->next = tmp;
         m->down = sl->top;
         m->data = NULL;
         m->sl = sl;
         if (sl->top) {
             sl->top->up = m;
         }
         else {
             sl->bottom = sl->bottomend = m;
         }
         sl->top = sl->topend = tmp->prev = m;
         tmp->up = tmp->next = tmp->nextindex = tmp->previndex = NULL;
         tmp->down = p;
         tmp->data = data;
         tmp->sl = sl;
         if (p) {
             p->up = tmp;
         }
         else {
             /* This sets ret to the bottom-most node we are inserting */
             ret = tmp;
         }
         p = tmp;
     }
     if (sl->index != NULL) {
         /*
          * this is a external insertion, we must insert into each index as
          * well
          */
         apr_skiplistnode *ni, *li;
         li = ret;
         for (p = apr_skiplist_getlist(sl->index); p; apr_skiplist_next(sl->index, &p)) {
             apr_skiplist *sli = (apr_skiplist *)p->data;
-            ni = apr_skiplist_insert_compare(sli, ret->data, sli->compare);
+            ni = insert_compare(sli, ret->data, sli->compare, 1, NULL);
             li->nextindex = ni;
             ni->previndex = li;
             li = ni;
         }
     }
     sl->size++;
     return ret;
 }
 
+APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert_compare(apr_skiplist *sl, void *data,
+                                      apr_skiplist_compare comp)
+{
+    if (!comp) {
+        return NULL;
+    }
+    return insert_compare(sl, data, comp, 0, NULL);
+}
+
 APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert(apr_skiplist *sl, void *data)
 {
     return apr_skiplist_insert_compare(sl, data, sl->compare);
 }
 
+APR_DECLARE(apr_skiplistnode *) apr_skiplist_add_compare(apr_skiplist *sl, void *data,
+                                      apr_skiplist_compare comp)
+{
+    if (!comp) {
+        return NULL;
+    }
+    return insert_compare(sl, data, comp, 1, NULL);
+}
+
+APR_DECLARE(apr_skiplistnode *) apr_skiplist_add(apr_skiplist *sl, void *data)
+{
+    return apr_skiplist_add_compare(sl, data, sl->compare);
+}
+
+APR_DECLARE(apr_skiplistnode *) apr_skiplist_replace_compare(apr_skiplist *sl,
+                                    void *data, apr_skiplist_freefunc myfree,
+                                    apr_skiplist_compare comp)
+{
+    if (!comp) {
+        return NULL;
+    }
+    return insert_compare(sl, data, comp, -1, myfree);
+}
+
+APR_DECLARE(apr_skiplistnode *) apr_skiplist_replace(apr_skiplist *sl,
+                                    void *data, apr_skiplist_freefunc myfree)
+{
+    return apr_skiplist_replace_compare(sl, data, myfree, sl->compare);
+}
+
 #if 0
 void skiplist_print_struct(apr_skiplist * sl, char *prefix)
 {
     apr_skiplistnode *p, *q;
     fprintf(stderr, "Skiplist Structure (height: %d)\n", sl->height);
     p = sl->bottom;
     while (p) {
         q = p;
         fprintf(stderr, prefix);
         while (q) {
             fprintf(stderr, "%p ", q->data);
             q = q->up;
         }
         fprintf(stderr, "\n");
         p = p->next;
     }
 }
 #endif
 
-static int skiplisti_remove(apr_skiplist *sl, apr_skiplistnode *m, apr_skiplist_freefunc myfree)
+static int skiplisti_remove(apr_skiplist *sl, apr_skiplistnode *m,
+                            apr_skiplist_freefunc myfree)
 {
     apr_skiplistnode *p;
     if (!m) {
         return 0;
     }
     if (m->nextindex) {
         skiplisti_remove(m->nextindex->sl, m->nextindex, NULL);
     }
     while (m->up) {
         m = m->up;
     }
-    while (m) {
+    do {
         p = m;
-        p->prev->next = p->next;/* take me out of the list */
+        /* take me out of the list */
+        p->prev->next = p->next;
         if (p->next) {
-            p->next->prev = p->prev;    /* take me out of the list */
+            p->next->prev = p->prev;
         }
         m = m->down;
         /* This only frees the actual data in the bottom one */
         if (!m && myfree && p->data) {
             myfree(p->data);
         }
-        skiplist_free_node(sl, p);
-    }
+        skiplist_put_node(sl, p);
+    } while (m);
     sl->size--;
     while (sl->top && sl->top->next == NULL) {
         /* While the row is empty and we are not on the bottom row */
         p = sl->top;
         sl->top = sl->top->down;/* Move top down one */
         if (sl->top) {
             sl->top->up = NULL; /* Make it think its the top */
         }
-        skiplist_free_node(sl, p);
+        skiplist_put_node(sl, p);
         sl->height--;
     }
     if (!sl->top) {
         sl->bottom = sl->bottomend = NULL;
         sl->topend = NULL;
     }
     return skiplist_height(sl);
 }
 
+APR_DECLARE(int) apr_skiplist_remove_node(apr_skiplist *sl,
+                                          apr_skiplistnode *iter,
+                                          apr_skiplist_freefunc myfree)
+{
+    apr_skiplistnode *m = iter;
+    if (!m) {
+        return 0;
+    }
+    while (m->down) {
+        m = m->down;
+    }
+    while (m->previndex) {
+        m = m->previndex;
+    }
+    return skiplisti_remove(sl, m, myfree);
+}
+
 APR_DECLARE(int) apr_skiplist_remove_compare(apr_skiplist *sli,
                             void *data,
                             apr_skiplist_freefunc myfree, apr_skiplist_compare comp)
 {
     apr_skiplistnode *m;
     apr_skiplist *sl;
     if (!comp) {
         return 0;
     }
     if (comp == sli->comparek || !sli->index) {
         sl = sli;
     }
     else {
         apr_skiplist_find(sli->index, (void *)comp, &m);
         if (!m) {
             return 0;
         }
         sl = (apr_skiplist *) m->data;
     }
-    skiplisti_find_compare(sl, data, &m, comp);
+    skiplisti_find_compare(sl, data, &m, comp, 0);
     if (!m) {
         return 0;
     }
     while (m->previndex) {
         m = m->previndex;
     }
     return skiplisti_remove(sl, m, myfree);
 }
 
 APR_DECLARE(int) apr_skiplist_remove(apr_skiplist *sl, void *data, apr_skiplist_freefunc myfree)
 {
     return apr_skiplist_remove_compare(sl, data, myfree, sl->comparek);
 }
 
 APR_DECLARE(void) apr_skiplist_remove_all(apr_skiplist *sl, apr_skiplist_freefunc myfree)
 {
     /*
      * This must remove even the place holder nodes (bottom though top)
      * because we specify in the API that one can free the Skiplist after
      * making this call without memory leaks
      */
     apr_skiplistnode *m, *p, *u;
     m = sl->bottom;
     while (m) {
         p = m->next;
         if (myfree && p && p->data) {
             myfree(p->data);
         }
         do {
             u = m->up;
-            skiplist_free_node(sl, m);
+            skiplist_put_node(sl, m);
             m = u;
         } while (m);
         m = p;
     }
     sl->top = sl->bottom = NULL;
     sl->topend = sl->bottomend = NULL;
     sl->height = 0;
     sl->size = 0;
 }
 
 APR_DECLARE(void *) apr_skiplist_pop(apr_skiplist *a, apr_skiplist_freefunc myfree)
 {
     apr_skiplistnode *sln;
     void *data = NULL;
     sln = apr_skiplist_getlist(a);
     if (sln) {
         data = sln->data;
         skiplisti_remove(a, sln, myfree);
     }
     return data;
 }
 
 APR_DECLARE(void *) apr_skiplist_peek(apr_skiplist *a)
 {
     apr_skiplistnode *sln;
     sln = apr_skiplist_getlist(a);
     if (sln) {
         return sln->data;
     }
     return NULL;
+}
+
+APR_DECLARE(size_t) apr_skiplist_size(const apr_skiplist *sl)
+{
+    return sl->size;
+}
+
+APR_DECLARE(int) apr_skiplist_height(const apr_skiplist *sl)
+{
+    return skiplist_height(sl);
+}
+
+APR_DECLARE(int) apr_skiplist_preheight(const apr_skiplist *sl)
+{
+    return sl->preheight;
+}
+
+APR_DECLARE(void) apr_skiplist_set_preheight(apr_skiplist *sl, int to)
+{
+    sl->preheight = (to > 0) ? to : 0;
 }
 
 static void skiplisti_destroy(void *vsl)
 {
     apr_skiplist_destroy(vsl, NULL);
 }
 
 APR_DECLARE(void) apr_skiplist_destroy(apr_skiplist *sl, apr_skiplist_freefunc myfree)
 {
     while (apr_skiplist_pop(sl->index, skiplisti_destroy) != NULL)
         ;
     apr_skiplist_remove_all(sl, myfree);
     if (!sl->pool) {
         while (sl->nodes_q.pos)
             free(sl->nodes_q.data[--sl->nodes_q.pos]);
         free(sl->nodes_q.data);
         free(sl->stack_q.data);
         free(sl);
     }
 }
 
 APR_DECLARE(apr_skiplist *) apr_skiplist_merge(apr_skiplist *sl1, apr_skiplist *sl2)
 {
     /* Check integrity! */
     apr_skiplist temp;
     struct apr_skiplistnode *b2;
     if (sl1->bottomend == NULL || sl1->bottomend->prev == NULL) {
         apr_skiplist_remove_all(sl1, NULL);
         temp = *sl1;
         *sl1 = *sl2;
         *sl2 = temp;
         /* swap them so that sl2 can be freed normally upon return. */
         return sl1;
     }
     if(sl2->bottom == NULL || sl2->bottom->next == NULL) {
         apr_skiplist_remove_all(sl2, NULL);
         return sl1;
     }
     /* This is what makes it brute force... Just insert :/ */
     b2 = apr_skiplist_getlist(sl2);
     while (b2) {
         apr_skiplist_insert(sl1, b2->data);
         apr_skiplist_next(sl2, &b2);
     }
     apr_skiplist_remove_all(sl2, NULL);
     return sl1;
 }
Index: head/contrib/apr/tables/apr_tables.c
===================================================================
--- head/contrib/apr/tables/apr_tables.c	(revision 361677)
+++ head/contrib/apr/tables/apr_tables.c	(revision 361678)
@@ -1,1296 +1,1300 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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
 
 #if (APR_POOL_DEBUG || defined(MAKE_TABLE_PROFILE)) && APR_HAVE_STDIO_H
 #include <stdio.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_clear(apr_array_header_t *arr)
 {
     arr->nelts = 0;
 }
 
 APR_DECLARE(void *) apr_array_pop(apr_array_header_t *arr)
 {
     if (apr_is_empty_array(arr)) {
         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:
      *   - Hash the key into the index:
      *     - index_first[TABLE_HASH(key)] is the offset within
      *       the table of the first entry with that key
      *     - index_last[TABLE_HASH(key)] is the offset within
      *       the table of the last entry with that key
      *   - If (and only if) there is no entry in the table whose
      *     key 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];
 };
 
 /* keep state for apr_table_getm() */
 typedef struct
 {
     apr_pool_t *p;
     const char *first;
     apr_array_header_t *merged;
 } table_getm_t;
 
 /*
  * 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 *do_table_push(const char *func, apr_table_t *t)
 {
     if (t->a.nelts == t->a.nalloc) {
         fprintf(stderr, "%s: table created by %p hit limit of %u\n",
                 func ? func : "table_push", t->creator, t->a.nalloc);
     }
     return (apr_table_entry_t *) apr_array_push_noclear(&t->a);
 }
 #if defined(__GNUC__) && __GNUC__ >= 2
 #define table_push(t) do_table_push(__FUNCTION__, t)
 #else
 #define table_push(t) do_table_push(NULL, t)
 #endif
 #else /* MAKE_TABLE_PROFILE */
 #define table_push(t)	((apr_table_entry_t *) apr_array_push_noclear(&(t)->a))
 #endif /* MAKE_TABLE_PROFILE */
 
 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));
 
 #if APR_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, "apr_table_copy: 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;
 }
 
 APR_DECLARE(apr_table_t *) apr_table_clone(apr_pool_t *p, const apr_table_t *t)
 {
     const apr_array_header_t *array = apr_table_elts(t);
     apr_table_entry_t *elts = (apr_table_entry_t *) array->elts;
     apr_table_t *new = apr_table_make(p, array->nelts);
     int i;
 
     for (i = 0; i < array->nelts; i++) {
         apr_table_add(new, elts[i].key, elts[i].val);
     }
 
     return new;
 }
 
 static void table_reindex(apr_table_t *t)
 {
     int i;
     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;
 
 #if APR_POOL_DEBUG
     {
 	apr_pool_t *pool;
 	pool = apr_pool_find(key);
 	if ((pool != (apr_pool_t *)key)
             && (!apr_pool_is_ancestor(pool, t->a.pool))) {
 	    fprintf(stderr, "apr_table_mergen: key not in ancestor pool of t\n");
 	    abort();
 	}
 	pool = apr_pool_find(val);
 	if ((pool != (apr_pool_t *)val)
             && (!apr_pool_is_ancestor(pool, t->a.pool))) {
 	    fprintf(stderr, "apr_table_mergen: 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;
 
 #if APR_POOL_DEBUG
     {
 	if (!apr_pool_is_ancestor(apr_pool_find(key), t->a.pool)) {
 	    fprintf(stderr, "apr_table_addn: key not in ancestor pool of t\n");
 	    abort();
 	}
 	if (!apr_pool_is_ancestor(apr_pool_find(val), t->a.pool)) {
 	    fprintf(stderr, "apr_table_addn: 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;
 
 #if APR_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,
 		"apr_table_overlay: overlay's pool is not an ancestor of p\n");
 	abort();
     }
     if (!apr_pool_is_ancestor(base->a.pool, p)) {
 	fprintf(stderr,
 		"apr_table_overlay: 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, 
                                            apr_size_t 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*));
     apr_size_t i;
     apr_size_t 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;
         apr_size_t 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)) {
 
             apr_size_t block1_start = next_start;
             apr_size_t block2_start = block1_start + blocksize;
             apr_size_t block1_end = block2_start;
             apr_size_t 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 (flags == APR_OVERLAP_TABLES_ADD) {
+        return;
+    }
+
     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 -= (int)(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)
 {
     if (a->a.nelts + b->a.nelts == 0) {
         return;
     }
 
 #if APR_POOL_DEBUG
     /* Since the keys and values are not copied, it's required that
      * b->a.pool has a lifetime at least as long as a->a.pool. */
     if (!apr_pool_is_ancestor(b->a.pool, a->a.pool)) {
         fprintf(stderr, "apr_table_overlap: b's pool is not an ancestor of a's\n");
         abort();
     }
 #endif
 
     apr_table_cat(a, b);
 
     apr_table_compress(a, flags);
 }
 
 static int table_getm_do(void *v, const char *key, const char *val)
 {
     table_getm_t *state = (table_getm_t *) v;
 
     if (!state->first) {
         /**
          * The most common case is a single header, and this is covered by
          * a fast path that doesn't allocate any memory. On the second and
          * subsequent header, an array is created and the array concatenated
          * together to form the final value.
          */
         state->first = val;
     }
     else {
         const char **elt;
         if (!state->merged) {
             state->merged = apr_array_make(state->p, 10, sizeof(const char *));
             elt = apr_array_push(state->merged);
             *elt = state->first;
         }
         elt = apr_array_push(state->merged);
         *elt = val;
     }
     return 1;
 }
 
 APR_DECLARE(const char *) apr_table_getm(apr_pool_t *p, const apr_table_t *t,
         const char *key)
 {
     table_getm_t state;
 
     state.p = p;
     state.first = NULL;
     state.merged = NULL;
 
     apr_table_do(table_getm_do, &state, t, key, NULL);
 
     if (!state.first) {
         return NULL;
     }
     else if (!state.merged) {
         return state.first;
     }
     else {
         return apr_array_pstrcat(p, state.merged, ',');
     }
 }
Index: head/contrib/apr/threadproc/unix/proc.c
===================================================================
--- head/contrib/apr/threadproc/unix/proc.c	(revision 361677)
+++ head/contrib/apr/threadproc/unix/proc.c	(revision 361678)
@@ -1,711 +1,739 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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"
 #include "apr_random.h"
 
 /* Heavy on no'ops, here's what we want to pass if there is APR_NO_FILE
  * requested for a specific child handle;
  */
 static apr_file_t no_file = { NULL, -1, };
 
 APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new,
                                               apr_pool_t *pool)
 {
     (*new) = (apr_procattr_t *)apr_pcalloc(pool, sizeof(apr_procattr_t));
 
     if ((*new) == NULL) {
         return APR_ENOMEM;
     }
     (*new)->pool = pool;
     (*new)->cmdtype = APR_PROGRAM;
     (*new)->uid = (*new)->gid = -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 rv;
 
     if ((in != APR_NO_PIPE) && (in != APR_NO_FILE)) {
         /* APR_CHILD_BLOCK maps to APR_WRITE_BLOCK, while
          * APR_PARENT_BLOCK maps to APR_READ_BLOCK, so transpose 
          * the CHILD/PARENT blocking flags for the stdin pipe.
          * stdout/stderr map to the correct mode by default.
          */
         if (in == APR_CHILD_BLOCK)
             in = APR_READ_BLOCK;
         else if (in == APR_PARENT_BLOCK)
             in = APR_WRITE_BLOCK;
 
         if ((rv = apr_file_pipe_create_ex(&attr->child_in, &attr->parent_in,
                                           in, attr->pool)) == APR_SUCCESS)
             rv = apr_file_inherit_unset(attr->parent_in);
         if (rv != APR_SUCCESS)
             return rv;
     }
     else if (in == APR_NO_FILE)
         attr->child_in = &no_file;
 
     if ((out != APR_NO_PIPE) && (out != APR_NO_FILE)) {
         if ((rv = apr_file_pipe_create_ex(&attr->parent_out, &attr->child_out,
                                           out, attr->pool)) == APR_SUCCESS)
             rv = apr_file_inherit_unset(attr->parent_out);
         if (rv != APR_SUCCESS)
             return rv;
     }
     else if (out == APR_NO_FILE)
         attr->child_out = &no_file;
 
     if ((err != APR_NO_PIPE) && (err != APR_NO_FILE)) {
         if ((rv = apr_file_pipe_create_ex(&attr->parent_err, &attr->child_err,
                                           err, attr->pool)) == APR_SUCCESS)
             rv = apr_file_inherit_unset(attr->parent_err);
         if (rv != APR_SUCCESS)
             return rv;
     }
     else if (err == APR_NO_FILE)
         attr->child_err = &no_file;
 
     return APR_SUCCESS;
 }
 
 
 APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr,
                                                     apr_file_t *child_in,
                                                     apr_file_t *parent_in)
 {
     apr_status_t rv = APR_SUCCESS;
 
     if (attr->child_in == NULL && attr->parent_in == NULL
            && child_in == NULL && parent_in == NULL)
         if ((rv = apr_file_pipe_create(&attr->child_in, &attr->parent_in,
                                        attr->pool)) == APR_SUCCESS)
             rv = apr_file_inherit_unset(attr->parent_in);
 
     if (child_in != NULL && rv == APR_SUCCESS) {
         if (attr->child_in && (attr->child_in->filedes != -1))
             rv = apr_file_dup2(attr->child_in, child_in, attr->pool);
         else {
             attr->child_in = NULL;
             if ((rv = apr_file_dup(&attr->child_in, child_in, attr->pool))
                     == APR_SUCCESS)
                 rv = apr_file_inherit_set(attr->child_in);
         }
     }
 
     if (parent_in != NULL && rv == APR_SUCCESS) {
         if (attr->parent_in)
             rv = apr_file_dup2(attr->parent_in, parent_in, attr->pool);
         else
             rv = apr_file_dup(&attr->parent_in, parent_in, attr->pool);
     }
 
     return rv;
 }
 
 
 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
            && child_out == NULL && parent_out == NULL)
         if ((rv = apr_file_pipe_create(&attr->parent_out, &attr->child_out,
                                        attr->pool)) == APR_SUCCESS)
             rv = apr_file_inherit_unset(attr->parent_out);
 
     if (child_out != NULL && rv == APR_SUCCESS) {
         if (attr->child_out && (attr->child_out->filedes != -1))
             rv = apr_file_dup2(attr->child_out, child_out, attr->pool);
         else {
             attr->child_out = NULL;
             if ((rv = apr_file_dup(&attr->child_out, child_out, attr->pool))
                     == APR_SUCCESS)
                 rv = apr_file_inherit_set(attr->child_out);
         }
     }
 
     if (parent_out != NULL && rv == APR_SUCCESS) {
         if (attr->parent_out)
             rv = apr_file_dup2(attr->parent_out, parent_out, attr->pool);
         else
             rv = apr_file_dup(&attr->parent_out, parent_out, attr->pool);
     }
 
     return rv;
 }
 
 
 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
            && child_err == NULL && parent_err == NULL)
         if ((rv = apr_file_pipe_create(&attr->parent_err, &attr->child_err,
                                       attr->pool)) == APR_SUCCESS)
             rv = apr_file_inherit_unset(attr->parent_err);
 
     if (child_err != NULL && rv == APR_SUCCESS) {
         if (attr->child_err && (attr->child_err->filedes != -1))
             rv = apr_file_dup2(attr->child_err, child_err, attr->pool);
         else {
             attr->child_err = NULL;
             if ((rv = apr_file_dup(&attr->child_err, child_err, attr->pool))
                     == APR_SUCCESS)
                 rv = apr_file_inherit_set(attr->child_err);
         }
     }
     if (parent_err != NULL && rv == APR_SUCCESS) {
         if (attr->parent_err)
             rv = apr_file_dup2(attr->parent_err, parent_err, attr->pool);
         else
             rv = apr_file_dup(&attr->parent_err, parent_err, attr->pool);
     }
 
     return rv;
 }
 
 
 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;
     
     memset(proc, 0, sizeof(apr_proc_t));
 
     if ((pid = fork()) < 0) {
         return errno;
     }
     else if (pid == 0) {
         proc->pid = getpid();
 
         apr_random_after_fork(proc);
 
         return APR_INCHILD;
     }
 
     proc->pid = pid;
 
     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_procattr_user_set(apr_procattr_t *attr,
                                                 const char *username,
                                                 const char *password)
 {
     apr_status_t rv;
     apr_gid_t    gid;
 
     if ((rv = apr_uid_get(&attr->uid, &gid, username,
                           attr->pool)) != APR_SUCCESS) {
         attr->uid = -1;
         return rv;
     }
     
     /* Use default user group if not already set */
     if (attr->gid == -1) {
         attr->gid = gid;
     }
     return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_procattr_group_set(apr_procattr_t *attr,
                                                  const char *groupname)
 {
     apr_status_t rv;
 
     if ((rv = apr_gid_get(&attr->gid, groupname, attr->pool)) != APR_SUCCESS)
         attr->gid = -1;
     return rv;
 }
 
 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, 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) {
         /* 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) && (attr->child_in->filedes == -1)) {
             close(STDIN_FILENO);
         }
         else if (attr->child_in &&
                  attr->child_in->filedes != STDIN_FILENO) {
             dup2(attr->child_in->filedes, STDIN_FILENO);
             apr_file_close(attr->child_in);
         }
 
         if ((attr->child_out) && (attr->child_out->filedes == -1)) {
             close(STDOUT_FILENO);
         }
         else if (attr->child_out &&
                  attr->child_out->filedes != STDOUT_FILENO) {
             dup2(attr->child_out->filedes, STDOUT_FILENO);
             apr_file_close(attr->child_out);
         }
 
         if ((attr->child_err) && (attr->child_err->filedes == -1)) {
             close(STDERR_FILENO);
         }
         else if (attr->child_err &&
                  attr->child_err->filedes != STDERR_FILENO) {
             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 (!geteuid()) {
+            apr_procattr_pscb_t *c = attr->perms_set_callbacks;
 
+            while (c) {
+                apr_status_t r;
+                r = (*c->perms_set_fn)((void *)c->data, c->perms,
+                                       attr->uid, attr->gid);
+                if (r != APR_SUCCESS && r != APR_ENOTIMPL) {
+                    _exit(-1);
+                }
+                c = c->next;
+            }
+        }
         /* Only try to switch if we are running as root */
         if (attr->gid != -1 && !geteuid()) {
             if (setgid(attr->gid)) {
                 if (attr->errfn) {
                     attr->errfn(pool, errno, "setting of group failed");
                 }
                 _exit(-1);   /* We have big problems, the child should exit. */
             }
         }
 
         if (attr->uid != -1 && !geteuid()) {
             if (setuid(attr->uid)) {
                 if (attr->errfn) {
                     attr->errfn(pool, errno, "setting of user failed");
                 }
                 _exit(-1);   /* We have big problems, the child should exit. */
             }
         }
 
         if (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 && (attr->child_in->filedes != -1)) {
         apr_file_close(attr->child_in);
     }
 
     if (attr->child_out && (attr->child_out->filedes != -1)) {
         apr_file_close(attr->child_out);
     }
 
     if (attr->child_err && (attr->child_err->filedes != -1)) {
         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;
 }
 
 #if APR_HAVE_STRUCT_RLIMIT
 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;
 }
 #endif /* APR_HAVE_STRUCT_RLIMIT */
 
+APR_DECLARE(apr_status_t) apr_procattr_perms_set_register(apr_procattr_t *attr,
+                                                 apr_perms_setfn_t *perms_set_fn,
+                                                 void *data,
+                                                 apr_fileperms_t perms)
+{
+    apr_procattr_pscb_t *c;
+
+    c = apr_palloc(attr->pool, sizeof(apr_procattr_pscb_t));
+    c->data = data;
+    c->perms = perms;
+    c->perms_set_fn = perms_set_fn;
+    c->next = attr->perms_set_callbacks;
+    attr->perms_set_callbacks = c;
+
+    return APR_SUCCESS;
+}
Index: head/contrib/apr/threadproc/unix/signals.c
===================================================================
--- head/contrib/apr/threadproc/unix/signals.c	(revision 361677)
+++ head/contrib/apr/threadproc/unix/signals.c	(revision 361678)
@@ -1,487 +1,481 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT 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
 
 #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
 
 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
 
 #if defined(__NetBSD__) || defined(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
 #if defined(__NetBSD__) || defined(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 (signum >= 0) ? sys_siglist[signum] : "unknown signal (number)";
 }
 
 #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 >= 0 && 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) || ! APR_HAS_THREADS
     if ((rv = sigprocmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
         rv = errno;
     }
 #else
     if ((rv = pthread_sigmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
     }
 #endif
     return rv;
 }
 
 #endif /* APR_HAS_THREADS && ... */
 
 APR_DECLARE(apr_status_t) apr_signal_block(int signum)
 {
 #if APR_HAVE_SIGACTION
     sigset_t sig_mask;
     int rv;
 
     sigemptyset(&sig_mask);
 
     sigaddset(&sig_mask, signum);
 
 #if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
     if ((rv = sigprocmask(SIG_BLOCK, &sig_mask, NULL)) != 0) {
         rv = errno;
     }
 #else
     if ((rv = pthread_sigmask(SIG_BLOCK, &sig_mask, NULL)) != 0) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
     }
 #endif
     return rv;
 #else
     return APR_ENOTIMPL;
 #endif
 }
 
 APR_DECLARE(apr_status_t) apr_signal_unblock(int signum)
 {
 #if APR_HAVE_SIGACTION
     sigset_t sig_mask;
     int rv;
 
     sigemptyset(&sig_mask);
 
     sigaddset(&sig_mask, signum);
 
 #if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
     if ((rv = sigprocmask(SIG_UNBLOCK, &sig_mask, NULL)) != 0) {
         rv = errno;
     }
 #else
     if ((rv = pthread_sigmask(SIG_UNBLOCK, &sig_mask, NULL)) != 0) {
 #ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
     }
 #endif
     return rv;
 #else
     return APR_ENOTIMPL;
 #endif
 }
Index: head/contrib/apr/tools/gen_test_char.c
===================================================================
--- head/contrib/apr/tools/gen_test_char.c	(revision 361677)
+++ head/contrib/apr/tools/gen_test_char.c	(revision 361678)
@@ -1,115 +1,131 @@
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #if defined(WIN32) || defined(OS2)
 #define NEED_ENHANCED_ESCAPES
 #endif
 
 #include <stdio.h>
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
 
 /* A bunch of functions in util.c scan strings looking for certain characters.
  * To make that more efficient we encode a lookup table.
  */
 #define T_ESCAPE_SHELL_CMD    (0x01)
 #define T_ESCAPE_PATH_SEGMENT (0x02)
 #define T_OS_ESCAPE_PATH      (0x04)
 #define T_ESCAPE_ECHO         (0x08)
 #define T_ESCAPE_URLENCODED   (0x10)
 #define T_ESCAPE_XML          (0x20)
+#define T_ESCAPE_LDAP_DN      (0x40)
+#define T_ESCAPE_LDAP_FILTER  (0x80)
 
 int main(int argc, char *argv[])
 {
     unsigned c;
     unsigned char flags;
 
     printf("/* this file is automatically generated by gen_test_char, "
            "do not edit. \"make include/private/apr_escape_test_char.h\" to regenerate. */\n"
            "#define T_ESCAPE_SHELL_CMD     (%u)\n"
            "#define T_ESCAPE_PATH_SEGMENT  (%u)\n"
            "#define T_OS_ESCAPE_PATH       (%u)\n"
            "#define T_ESCAPE_ECHO          (%u)\n"
            "#define T_ESCAPE_URLENCODED    (%u)\n"
            "#define T_ESCAPE_XML           (%u)\n"
+           "#define T_ESCAPE_LDAP_DN       (%u)\n"
+           "#define T_ESCAPE_LDAP_FILTER   (%u)\n"
            "\n"
            "static const unsigned char test_char_table[256] = {",
            T_ESCAPE_SHELL_CMD,
            T_ESCAPE_PATH_SEGMENT,
            T_OS_ESCAPE_PATH,
            T_ESCAPE_ECHO,
            T_ESCAPE_URLENCODED,
-           T_ESCAPE_XML);
+           T_ESCAPE_XML,
+           T_ESCAPE_LDAP_DN,
+           T_ESCAPE_LDAP_FILTER);
 
     for (c = 0; c < 256; ++c) {
         flags = 0;
         if (c % 20 == 0)
             printf("\n    ");
 
         /* escape_shell_cmd */
 #ifdef NEED_ENHANCED_ESCAPES
         /* Win32/OS2 have many of the same vulnerable characters
          * as Unix sh, plus the carriage return and percent char.
          * The proper escaping of these characters varies from unix
          * since Win32/OS2 use carets or doubled-double quotes,
          * and neither lf nor cr can be escaped.  We escape unix
          * specific as well, to assure that cross-compiled unix
          * applications behave similiarly when invoked on win32/os2.
          *
          * Rem please keep in-sync with apr's list in win32/filesys.c
          */
         if (c && strchr("&;`'\"|*?~<>^()[]{}$\\\n\r%", c)) {
             flags |= T_ESCAPE_SHELL_CMD;
         }
 #else
         if (c && strchr("&;`'\"|*?~<>^()[]{}$\\\n", c)) {
             flags |= T_ESCAPE_SHELL_CMD;
         }
 #endif
 
         if (!isalnum(c) && !strchr("$-_.+!*'(),:@&=~", c)) {
             flags |= T_ESCAPE_PATH_SEGMENT;
         }
 
         if (!isalnum(c) && !strchr("$-_.+!*'(),:@&=/~", c)) {
             flags |= T_OS_ESCAPE_PATH;
         }
 
         if (!isalnum(c) && !strchr(".-*_ ", c)) {
             flags |= T_ESCAPE_URLENCODED;
         }
 
         /* For logging, escape all control characters,
          * double quotes (because they delimit the request in the log file)
          * backslashes (because we use backslash for escaping)
          * and 8-bit chars with the high bit set
          */
         if (c && (!isprint(c) || c == '"' || c == '\\' || iscntrl(c))) {
             flags |= T_ESCAPE_ECHO;
         }
 
         if (strchr("<>&\"", c)) {
             flags |= T_ESCAPE_XML;
+        }
+
+        /* LDAP DN escaping (RFC4514) */
+        if (!isprint(c) || strchr("\"+,;<>\\", c)) {
+            flags |= T_ESCAPE_LDAP_DN;
+        }
+
+        /* LDAP filter escaping (RFC4515) */
+        if (!isprint(c) || strchr("*()\\", c)) {
+            flags |= T_ESCAPE_LDAP_FILTER;
         }
 
         printf("%u%c", flags, (c < 255) ? ',' : ' ');
     }
 
     printf("\n};\n");
 
     return 0;
 }
Index: head/contrib/apr
===================================================================
--- head/contrib/apr	(revision 361677)
+++ head/contrib/apr	(revision 361678)

Property changes on: head/contrib/apr
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/apr/dist:r286503-361671
Index: head/usr.bin/svn/lib/libapr/Makefile
===================================================================
--- head/usr.bin/svn/lib/libapr/Makefile	(revision 361677)
+++ head/usr.bin/svn/lib/libapr/Makefile	(revision 361678)
@@ -1,112 +1,116 @@
 # $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
 INTERNALLIB=	yes
 LIB=		apr
 SRCS=		apr_cpystrn.c \
+		apr_escape.c \
 		apr_fnmatch.c \
 		apr_getpass.c \
 		apr_hash.c \
 		apr_pools.c \
 		apr_random.c \
 		apr_skiplist.c \
 		apr_snprintf.c \
 		apr_strings.c \
 		apr_strnatcmp.c \
 		apr_strtok.c \
 		apr_tables.c \
 		buffer.c \
 		builtins.c \
 		charset.c \
 		common.c \
 		copy.c \
 		dir.c \
 		dso.c \
 		env.c \
 		epoll.c \
 		errorcodes.c \
 		fileacc.c \
 		filedup.c \
 		filepath.c \
 		filepath_util.c \
 		filestat.c \
 		flock.c \
 		fullrw.c \
 		getopt.c \
 		global_mutex.c \
 		groupinfo.c \
 		ia32.c \
 		inet_ntop.c \
 		inet_pton.c \
 		kqueue.c \
 		mktemp.c \
 		mmap.c \
 		multicast.c \
 		mutex.c \
 		open.c \
 		otherchild.c \
 		pipe.c \
 		poll.c \
 		pollcb.c \
 		pollset.c \
 		port.c \
 		ppc.c \
 		proc.c \
 		proc_mutex.c \
 		procsup.c \
 		rand.c \
 		readwrite.c \
 		s390.c \
 		seek.c \
 		select.c \
 		sendrecv.c \
 		sha2.c \
 		sha2_glue.c \
 		shm.c \
 		signals.c \
 		sockaddr.c \
 		socket_util.c \
 		sockets.c \
 		sockopt.c \
 		solaris.c \
 		start.c \
 		tempdir.c \
 		thread.c \
 		thread_cond.c \
 		thread_mutex.c \
 		thread_rwlock.c \
 		threadpriv.c \
 		time.c \
 		timestr.c \
 		userinfo.c \
 		version.c \
 		waitio.c \
+		wakeup.c \
 		z_asio.c
 
 .PATH:		${APR}/atomic/unix \
 		${APR}/dso/unix \
+		${APR}/encoding \
 		${APR}/file_io/unix \
 		${APR}/locks/unix \
 		${APR}/memory/unix \
 		${APR}/misc/unix \
 		${APR}/mmap/unix \
 		${APR}/network_io/unix \
 		${APR}/passwd \
 		${APR}/poll/unix \
 		${APR}/random/unix \
 		${APR}/shmem/unix \
 		${APR}/strings \
 		${APR}/support/unix \
 		${APR}/tables \
 		${APR}/threadproc/unix \
 		${APR}/time/unix \
 		${APR}/user/unix \
 		${APR}/include
 
 CFLAGS+=	-DHAVE_CONFIG_H \
 		-I${.CURDIR} \
 		-I${APR}/include/arch/unix \
+		-I${APR}/include/private \
 		-I${APR}/include
 
 .include <bsd.lib.mk>
Index: head/usr.bin/svn/lib/libapr/apr_escape_test_char.h
===================================================================
--- head/usr.bin/svn/lib/libapr/apr_escape_test_char.h	(nonexistent)
+++ head/usr.bin/svn/lib/libapr/apr_escape_test_char.h	(revision 361678)
@@ -0,0 +1,27 @@
+/* $FreeBSD$ */
+
+/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
+#define T_ESCAPE_SHELL_CMD     (1)
+#define T_ESCAPE_PATH_SEGMENT  (2)
+#define T_OS_ESCAPE_PATH       (4)
+#define T_ESCAPE_ECHO          (8)
+#define T_ESCAPE_URLENCODED    (16)
+#define T_ESCAPE_XML           (32)
+#define T_ESCAPE_LDAP_DN       (64)
+#define T_ESCAPE_LDAP_FILTER   (128)
+
+static const unsigned char test_char_table[256] = {
+    224,222,222,222,222,222,222,222,222,222,223,222,222,222,222,222,222,222,222,222,
+    222,222,222,222,222,222,222,222,222,222,222,222,6,16,127,22,17,22,49,17,
+    145,145,129,80,80,0,0,18,0,0,0,0,0,0,0,0,0,0,16,87,
+    119,16,119,23,16,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,23,223,23,23,0,23,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,23,23,23,17,222,222,222,222,222,222,222,222,222,222,222,222,222,
+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,
+    222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222 
+};

Property changes on: head/usr.bin/svn/lib/libapr/apr_escape_test_char.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property