summaryrefslogtreecommitdiff
path: root/configure.in
Commit message (Collapse)AuthorAgeFilesLines
* * configure.in: Really don't define apr_sigwait in apr_private.h anyjorton2005-01-131-6/+0
| | | | | | | more. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@125066 13f79535-47bb-0310-9956-ffa450edef68
* * acconfig.h: Remove file.jorton2005-01-131-0/+21
| | | | | | | | | | | | | | * configure.in: Use autoheader AH_BOTTOM macro to hard-code tail end of apr_private.h. * threadproc/unix/signals.c (apr_sigwait): Define here rather than in apr_private.h since it's only used here. * build/apr_common.m4 (APR_DECIDE): AC_DEFUN the macro, use AH_TEMPLATE to define the template for apr_private.h. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@125062 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Require autoconf 2.50. Use AC_CHECK_MEMBERS to checkjorton2005-01-131-7/+5
| | | | | | | | | | | | | | for struct tm members tm_gmtoff and __tm_gmtoff (the check for __tm_gmtoff seemed to be missing!). * time/unix/time.c: Define NO_GMTOFF_IN_STRUCT_TM if neither member is found. (get_offset, apr_os_exp_time_get, apr_os_exp_time_put): Use new macro names. (apr_unix_setup_time): Use NO_GMTOFF_IN_STRUCT_TM. * time/unix/timestr.c (apr_strftime): Use new macro names. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@125058 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Aggregate some AC_CHECK_FUNCS usage.jorton2005-01-101-7/+3
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@124808 13f79535-47bb-0310-9956-ffa450edef68
* Adding an initial Multicast API.pquerna2005-01-021-0/+3
| | | | | | | | | | Tested On: OS X, FreeBSD, NetBSD and Linux. Needs more Platform Specific Code: Netware, Windows git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@123883 13f79535-47bb-0310-9956-ffa450edef68
* Add a build script to create Solaris packages from APRminfrin2004-12-141-0/+1
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@111877 13f79535-47bb-0310-9956-ffa450edef68
* Use uuid_generate() and uuid_create() for the apr_os_uuid_get() interfacepquerna2004-11-221-0/+13
| | | | | | | | | | on platforms that support them. Tested On: Linux 2.6 (libuuid) and FreeBSD 5.2.1 (libc has uuid_create) git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@106214 13f79535-47bb-0310-9956-ffa450edef68
* Added support for Solaris 10 Event Completion Framework aspquerna2004-11-221-1/+1
| | | | | | | | | | | | a backend to APR Pollset. Best Docs: http://developers.sun.com/solaris/articles/event_completion.html I have only been able to test this on Solaris 10 on x86 with gcc. If anyone could test on Sparc with other compilers that would be great. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@106156 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Fix the documentation string for '--enable-experimental-libtool'pquerna2004-11-191-1/+1
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@105898 13f79535-47bb-0310-9956-ffa450edef68
* Add --config to jlibtool to fill shlibpath_var in configure.jfclere2004-09-301-0/+4
| | | | | | | BTW: Why do we grep in (GNU) libtool instead using --config? git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65357 13f79535-47bb-0310-9956-ffa450edef68
* Only install apr-$MAJOR-config and add appropriate detection code tojerenkrantz2004-08-011-2/+4
| | | | | | | | | | | | | | | find_apr.m4 (APR_FIND_APR). Justin made a few changes to Max's latest patch: - Emit a warning at autoconf-time and default to [0 1] if 4th arg is missing. - Fix some tpyos - Change apr-config.in to not use multiple @APR_MAJOR_VERSION@ substs. Submitted by: Max Bowsher Reviewed by: Justin Erenkrantz git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65293 13f79535-47bb-0310-9956-ffa450edef68
* Re-instate jlibtool from deleted revision 1.5. Paperwork filed. All is well.jerenkrantz2004-07-081-4/+1
| | | | | | | | * configure.in: We now include jlibtool in our base distribution. * build/jlibtool.c: Restore deleted revision 1.5. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65273 13f79535-47bb-0310-9956-ffa450edef68
* * poll/unix/poll.c (backend_cleanup): Only define if using epoll/kqueue.jorton2004-07-071-6/+3
| | | | | | | | | | (apr_pollset_destroy): Only run cleanup if using epoll/kqueue. (apr_pollset_add): Fix warning for ye olde platforms still using poll(). * configure.in: Just check for kqueue() in an AC_CHECK_FUNCS. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65265 13f79535-47bb-0310-9956-ffa450edef68
* Add support for KQueue and sys_epoll to apr_pollset.jerenkrantz2004-07-061-0/+19
| | | | | | | | | | (Justin tweaked the cleanup code from Paul's last posted patch.) Submitted by: Paul Querna Reviewed by: Justin Erenkrantz, Joe Orton git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65261 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in, config.layout: Add -version suffix to defaultjorton2004-06-301-1/+1
| | | | | | | installbuilddir directory. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65248 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Remove check for res_init again.jorton2004-06-301-2/+0
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65244 13f79535-47bb-0310-9956-ffa450edef68
* Get the correct setting for which locking mechanism to use.dreid2004-06-291-2/+11
| | | | | | | | This gets the headers to agree with the actual code - which is usually a good thing :-) git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65241 13f79535-47bb-0310-9956-ffa450edef68
* Use libbind/libresolv when available. Check <sys/types.h> before checking ↵martin2004-06-291-1/+4
| | | | | | other special headers; Substitute INCLUDES git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65233 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Don't use POSIX semaphores or cross-process pthreadjorton2004-06-141-10/+4
| | | | | | | | | | | | mutexes as the default inter-process locking mechanism. * build/apr_hints.m4: Force default inter-process locking mechanism to fcntl for Solaris, as per 1.3. Reviewed by: Jeff Trawick git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65198 13f79535-47bb-0310-9956-ffa450edef68
* Support POSIX semaphores on LP64 platforms:jorton2004-06-141-2/+0
| | | | | | | | | | | | | | | | * configure.in: Don't disable POSIX semaphore support on LP64 platforms. * include/arch/unix/apr_arch_proc_mutex.h (struct apr_proc_mutex_t): Add a sem_t pointer field. * locks/unix/proc_mutex.c (proc_mutex_posix_create, proc_mutex_posix_cleanup, proc_mutex_posix_acquire, prox_mutex_posix_release): Use the sem_t pointer not the fd for the semaphore. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65185 13f79535-47bb-0310-9956-ffa450edef68
* Revert accidental commit.jorton2004-06-101-1/+6
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65180 13f79535-47bb-0310-9956-ffa450edef68
* Add apr_threadattr_guardsize_set function, which allows changingjorton2004-06-101-7/+3
| | | | | | | | | | | | | | | | | | | the thread guard area size attribute for newly created threads. * configure.in: Check for pthread_attr_setguardsize. * include/apr_thread_proc.h (apr_threadattr_guardsize_set): Add prototype. * threadproc/unix/thread.c (apr_threadattr_guardsize_set): Add function. * threadproc/os2/thread.c, threadproc/win32/thread.c, threadproc/beos/thread.c, threadproc/netware/thread.c (apr_threadattr_guardsize_set): Add ENOTIMPL stubs. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65179 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in, include/arch/unix/apr_arch_proc_mutex.h,jorton2004-06-051-2/+0
| | | | | | | | include/apr.h.in: Remove unimplemented "rwlock" serialization definitions. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65164 13f79535-47bb-0310-9956-ffa450edef68
* Move APR_INT64_STRFN to apr_private.h and remove redundantjorton2004-06-041-4/+8
| | | | | | | | | | | | | | | | | | APR_HAVE_INT64_STRFN macro. * configure.in: Define APR_HAVE_INT64 macro. * include/apr.h.in, include/apr.hw, include/apr.hnw: Remove APR_INT64_STRFN, APR_HAVE_INT64_STRFN macros. * include/arch/win32/apr_private.h, include/arch/netware/apr_private.h: Define APR_INT64_STRFN (and correctly for Win32, fix from Andr��). * strings/apr_strings.c (apr_strtoi64): Just use APR_INT64_STRFN. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65160 13f79535-47bb-0310-9956-ffa450edef68
* Drop racy/broken Unix nested mutex implementation; use SUSv3-stylejorton2004-06-041-0/+1
| | | | | | | | | | | | | | | | | | | recursive mutex support if available: * build/apr_threads.m4 (APR_CHECK_PTHREAD_RECURSIVE_MUTEX): New macro. * configure.in: Use it. * include/arch/unix/apr_arch_thread_mutex.h (struct apr_thread_mutex_t): Drop nested mutex tracking fields. * locks/unix/thread_mutex.c (apr_thread_mutex_create): Return ENOTIMPL if lacking recursive mutex support, else create a recursive mutex. (apr_thread_mutex_lock, apr_thread_mutex_unlock, apr_thread_mutex_trylock): Remove nested mutex tracking. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65157 13f79535-47bb-0310-9956-ffa450edef68
* Add pkg-config APR file.thommay2004-05-291-0/+1
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65141 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in, include/arch/win32/apr_private.h,jorton2004-05-241-0/+11
| | | | | | | | | | | | | | include/arch/netware/apr_private.h: Define APR_OFF_T_STRFN. * include/apr_strings.h, strings/apr_strings.c: Add apr_strtoff() function. * test/teststr.c (string_strtoff): Add test. Submitted by: Andr�� Malo, Joe Orton git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65120 13f79535-47bb-0310-9956-ffa450edef68
* Don't assume getnameinfo() can handle IPv4-mapped IPv6 addressestrawick2004-05-201-1/+0
| | | | | | | | | on any platforms. Submitted by: Jeff Trawick, Joe Orton, Colm MacC�rthaigh <colm@stdlib.net> git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65103 13f79535-47bb-0310-9956-ffa450edef68
* Provide workaround for socklen_t declaration problem with 64-bittrawick2004-04-161-0/+12
| | | | | | | | | | | | | | | build on HP-UX. also, mention these prior commits which clean up 64-bit compiles on HP-UX ia64: Stop setting a PA-RISC-specific compile option on ia64. Look for -mt thread option, which is used with HP-UX vendor compiler on ia64. Alluded to before by: Madhusudan Mathihalli git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65064 13f79535-47bb-0310-9956-ffa450edef68
* +DAportable is not valid for HP-UX native compiler on ia64trawick2004-04-161-4/+10
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65061 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Clarify comment.jorton2004-03-311-1/+1
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65033 13f79535-47bb-0310-9956-ffa450edef68
* Add LFS support:jorton2004-03-271-22/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.in: Check for off64_t and necessary LFS functions, define apr_off_t as off64_t where available. Add --disable-lfs flag. Forward-port changes from 0.9.5 to define apr_off_t as long on systems systems with a 32-bit off_t which don't have LFS enabled. * include/apr.h.in: Let configure define APR_HAS_LARGE_FILES. * include/arch/netware/apr_arch_file_io.h: Redefine lseek and ftruncate. * include/arch/unix/apr_arch_file_io.h: Redefine stat, lstat, fstat, lseek, ftruncate here; define struct_stat. * file_io/unix/filestat.c: Use struct_stat. * file_io/unix/mktemp.c: Use mkstemp64 where available. * file_io/unix/open.c (apr_file_open): Use O_LARGEFILE by default when LFS is enabled. * file_io/unix/readwrite.c, file_io/unix/seek.c: Don't redefine lseek and ftruncate here. * mmap/unix/mmap.c (apr_mmap_create): Use mmap64 if available; otherwise check for overflow when LFS is enabled. * network_io/unix/sendrecv.c (apr_socket_sendfile) [Linux/HPUX]: Use sendfile64 if available; otherwise check for overflow when LFS is enabled. [solaris]: Use sendfilev64/sendfilevec64_t. * test/Makefile.in, test/test_apr.h, test/testlfs.c: Add tests. Reviewed by: Jeff Trawick git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65027 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in, build/apr_common.m4: Remove checks for crypt_r whichjorton2004-03-131-4/+0
| | | | | | | are only necessary in apr-util. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64974 13f79535-47bb-0310-9956-ffa450edef68
* Stop messing around with _FOO_SOURCE things mid-configure: enablejorton2004-03-131-15/+3
| | | | | | | | | | | | | | | | _GNU_SOURCE for glibc-based systems in the platform hints. (and avoid jumping through hoops to define _{XOPEN,BSD,SVID}_SOURCE which are all implied by _GNU_SOURCE anyway) * build/apr_hints.m4: Define _GNU_SOURCE in CPPFLAGS for GNU/HURD and GNU/Linux. * build/apr_common.m4: Remove tricks to get glibc to expose crypt_r. * configure.in: Remove tricks to get glibc to expose pthread_rwlock_t. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64972 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Don't use AC_TYPE_SIZE_T twice.jorton2004-03-121-1/+0
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64969 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Fix comparison of mmap() return value.jorton2004-02-211-1/+1
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64915 13f79535-47bb-0310-9956-ffa450edef68
* Fix the generation of the build-outputs.mk file. That file must remaingstein2004-02-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform independent since it gets included with the tarball, and the tarball is targeted for all platforms. In this new scheme, the build-outputs.mk includes symbols named OBJECTS_<plat> which specifies the necessary object files for each platform. The apr_rules.mk(.in) file then pulls in the right symbol for the configured platform. Since apr-util directly uses apr_rules.mk, then it picks up the same logic with no change. The build.conf was altered to include a set of platform-independent files, and subdirectories which contain per-platform subdirectories. This was needed to help out the logic which selects object files based on whether a platform is present in each source subdir. (and if a platform subdir is not present, then "parent" gets used instead; e.g. use 'unix' if 'beos' is not in the subdir) Lastly, configure.in was updated to select the appropriate set of objects for the build. * build.conf: (paths): remove per-platform symbols (platform_dirs): new option to list the dirs which have platform subdirs * configure.in: - define and substitute OBJECTS_PLATFORM to reference the platform specific set of objects, which get defined in build-outputs.mk * build/apr_rules.mk.in: - define OBJECTS in terms of the substituted OBJECTS_PLATFORM symbol * build/gen-build.py: (PLATFORMS): the various platforms found in APR. unused, actually. (MAKE_PLATFORMS): the platforms which use a Makefile, and what default platform should be used if SUBDIR/<platform> is not present. (main): update logic to generate multiple OBJECTS_* symbols. this now includes logic to deal with subdirs which may not have a platform subdir for the platform in question, thus needing to default to another. (write_objects): some code factored out of main() to process a list of source files into dependencies lines in the makefile. (get_files): no more need to substitute for {platform}, and simplified some of the .split() stuff. (get_platform): no longer required. we generate for all platforms. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64914 13f79535-47bb-0310-9956-ffa450edef68
* Revert to using i386-pc-os2-emx on OS/2 rather than non-standardjorton2004-02-181-2/+2
| | | | | | | | | | | | ...-os2_emx; entirely untested: * configure.in, build/apr_hints.m4: Match OS/2 by "*-os2*". * build/config.sub, build/config.guess: Remove customisations for *-os2. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64911 13f79535-47bb-0310-9956-ffa450edef68
* VPATH build fixes:jorton2004-02-051-3/+3
| | | | | | | | | | * configure.in: Point at build-outputs.mk in the srcdir. * Makefile.in: Define top_srcdir and top_blddir etc higher; include $srcdir/arch/@OSDIR@ and $srcdir/include. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64894 13f79535-47bb-0310-9956-ffa450edef68
* First whack at switching to a single top-level make. This adds a dependencygstein2004-02-051-41/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upon Python at packaging time, but not at end-user config/build time. As far as I can tell, the build continues to function properly. (out-of-dir config/make not tested, and apr-iconv prolly needs some work) The buildconf scripts now generate a build-outputs.mk file which is included by the root's Makefile (via the build/gen-build.py script). bulid-outputs.mk specifies all of the various files present in the distribution. The top-level Makefiles were simplified to use an $(OBJECTS) symbol rather than 'find'ing them. Similarly, a $(HEADERS) symbol is used for the exports. The corresponding delete-* targets were eliminated since we have a precise set of inputs. The subdirs' Makefiles were removed since they are no longer called/used. The apr-util/uri Makefile was responsible for compiling a C program to generate the uri_delims.h file. That process was replaced by a Python script to generate the header (called by buildconf). The .c and .dsp were left for the Windows build to continue, but that should be revamped. build/apr_rules.mk was revamped somewhat to avoid recursion, but a lot of cleanup is still needed. Much of the recursive/local/x- logic is no longer needed and can be elimianated. rules.mk was created for inclusion by N makefiles, but that isn't really true any more, so it could probably be tossed (caveat: test/Makefile). Saved for a phase 2. Some additional work was added to properly clean up files in */build/, rather than relying on a makefile in there. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64891 13f79535-47bb-0310-9956-ffa450edef68
* Remove "location detection" from apr-config:jorton2004-02-011-0/+5
| | | | | | | | | | | | | | | | | * configure.in: Substitute APR_CONFIG_LOCATION as "build" or "source" appropriately. * apr-config.in: Set location to @APR_CONFIG_LOCATION@ rather than fragile pwd/realpath guesswork; pick up and use APR_BUILD_DIR instead of $thisdir. * Makefile.in (apr-config.out): New target. (install): Install apr-config.out instead of apr-config. PR: 8867 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64888 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Fix detection of pthread rwlocks to actually fail whenjorton2004-01-261-12/+12
| | | | | | | | | | | | | pthread_rwlock_t can't be used; print and cache results of tests carried out; define HAVE_PTHREAD_RWLOCKS when rwlocks can be used. * locks/unix/thread_rwlock.c, include/arch/unix/apr_arch_thread_rwlock.h: Use new HAVE_PTHREAD_RWLOCKS define. PR: 22990 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64882 13f79535-47bb-0310-9956-ffa450edef68
* Fix build with recent libtool HEAD:jorton2004-01-151-0/+1
| | | | | | | | | | * buildconf: Use the libtool.m4 which libtoolize copies into the cwd, if found. Move ltsugar.m4 into build if found. * configure.in: Pick up ltsugar.m4. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64873 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Fix detection of APR_OFF_T_FMT if built withjorton2004-01-121-9/+12
| | | | | | | -D_FILE_OFFSET_BITS=64 on 32-bit Linux/Solaris/AIX platforms. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64869 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Separate library checks from "checking for compilerjorton2004-01-081-0/+2
| | | | | | | flags" output. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64863 13f79535-47bb-0310-9956-ffa450edef68
* Clean up configure logic for enabling "nonportable" atomics: don'tjorton2004-01-061-28/+19
| | | | | | | | | | | | | | | | export the result via apr.h, and enable use of inline asm by default on ppc64 and x86_64. * configure.in: Define USE_GENERIC_ATOMICS on i[456]86 unless --enable-nonportable-atomics was used. * include/apr.h.in: Remove APR_FORCE_GENERIC_ATOMICS. * atomic/unix/apr_atomic.c: Check for !defined(USE_GENERIC_ATOMICS) rather than defined(APR_FORCE_GENERIC_ATOMICS). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64861 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Don't pick up libnsl if gethostbyname is in libc,jorton2004-01-051-2/+2
| | | | | | | | | don't pick up libsocket if socket is in libc. Submitted by: Noah Misch <noah@cs.caltech.edu> git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64858 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Remove check for sqrt(), which is not used by APR.jorton2004-01-021-1/+0
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64855 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in: Size of long double is no longer needed.jorton2003-12-091-1/+0
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64820 13f79535-47bb-0310-9956-ffa450edef68
* allow non-portable atomics on Linux/ppcgregames2003-12-081-1/+1
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64819 13f79535-47bb-0310-9956-ffa450edef68