aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2021-06-11 21:56:41 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2021-06-11 21:56:41 +0000
commit0333fad1b7e042eea0fe8348c6fde8ee55538d63 (patch)
treeeeecf14226e7c240dbc6c252ae18944cce10076f
parente290182bcf3895ca659dff111bca6a077c4708b1 (diff)
downloadsrc-0333fad1b7e0.tar.gz
src-0333fad1b7e0.zip
Remove svnlite.
Reviewed by: bcr, imp, emaste Differential Revision: https://reviews.freebsd.org/D30737
-rw-r--r--Makefile.inc11
-rw-r--r--ObsoleteFiles.inc25
-rw-r--r--contrib/apr-util/CHANGES83
-rw-r--r--contrib/apr-util/CMakeLists.txt355
-rw-r--r--contrib/apr-util/LICENSE459
-rw-r--r--contrib/apr-util/Makefile.in123
-rw-r--r--contrib/apr-util/Makefile.win384
-rw-r--r--contrib/apr-util/NOTICE14
-rw-r--r--contrib/apr-util/NWGNUmakefile310
-rw-r--r--contrib/apr-util/README111
-rw-r--r--contrib/apr-util/README.FREETDS11
-rw-r--r--contrib/apr-util/README.cmake139
-rw-r--r--contrib/apr-util/apr-util.pc.in13
-rw-r--r--contrib/apr-util/apr-util.spec200
-rw-r--r--contrib/apr-util/aprutil.dsw443
-rw-r--r--contrib/apr-util/apu-config.in221
-rw-r--r--contrib/apr-util/buckets/apr_brigade.c736
-rw-r--r--contrib/apr-util/buckets/apr_buckets.c46
-rw-r--r--contrib/apr-util/buckets/apr_buckets_alloc.c234
-rw-r--r--contrib/apr-util/buckets/apr_buckets_eos.c54
-rw-r--r--contrib/apr-util/buckets/apr_buckets_file.c242
-rw-r--r--contrib/apr-util/buckets/apr_buckets_flush.c54
-rw-r--r--contrib/apr-util/buckets/apr_buckets_heap.c96
-rw-r--r--contrib/apr-util/buckets/apr_buckets_mmap.c144
-rw-r--r--contrib/apr-util/buckets/apr_buckets_pipe.c119
-rw-r--r--contrib/apr-util/buckets/apr_buckets_pool.c142
-rw-r--r--contrib/apr-util/buckets/apr_buckets_refcount.c64
-rw-r--r--contrib/apr-util/buckets/apr_buckets_simple.c137
-rw-r--r--contrib/apr-util/buckets/apr_buckets_socket.c114
-rw-r--r--contrib/apr-util/build-outputs.mk152
-rw-r--r--contrib/apr-util/build.conf104
-rwxr-xr-xcontrib/apr-util/buildconf118
-rw-r--r--contrib/apr-util/config.layout232
-rwxr-xr-xcontrib/apr-util/configure25340
-rw-r--r--contrib/apr-util/configure.in344
-rw-r--r--contrib/apr-util/crypto/apr_crypto.c608
-rw-r--r--contrib/apr-util/crypto/apr_crypto_commoncrypto.c906
-rw-r--r--contrib/apr-util/crypto/apr_crypto_nss.c1097
-rw-r--r--contrib/apr-util/crypto/apr_crypto_openssl.c973
-rw-r--r--contrib/apr-util/crypto/apr_md4.c404
-rw-r--r--contrib/apr-util/crypto/apr_md5.c666
-rw-r--r--contrib/apr-util/crypto/apr_passwd.c200
-rw-r--r--contrib/apr-util/crypto/apr_sha1.c368
-rw-r--r--contrib/apr-util/crypto/apr_siphash.c196
-rw-r--r--contrib/apr-util/crypto/crypt_blowfish.c902
-rw-r--r--contrib/apr-util/crypto/crypt_blowfish.h27
-rw-r--r--contrib/apr-util/crypto/getuuid.c208
-rw-r--r--contrib/apr-util/crypto/uuid.c130
-rw-r--r--contrib/apr-util/dbd/NWGNUdbdmysql295
-rw-r--r--contrib/apr-util/dbd/NWGNUdbdpgsql301
-rw-r--r--contrib/apr-util/dbd/NWGNUdbdsqli2296
-rw-r--r--contrib/apr-util/dbd/NWGNUdbdsqli3298
-rw-r--r--contrib/apr-util/dbd/NWGNUmakefile259
-rw-r--r--contrib/apr-util/dbd/apr_dbd.c573
-rw-r--r--contrib/apr-util/dbd/apr_dbd_mysql.c1305
-rw-r--r--contrib/apr-util/dbd/apr_dbd_odbc.c1750
-rw-r--r--contrib/apr-util/dbd/apr_dbd_oracle.c2220
-rw-r--r--contrib/apr-util/dbd/apr_dbd_pgsql.c1315
-rw-r--r--contrib/apr-util/dbd/apr_dbd_sqlite2.c566
-rw-r--r--contrib/apr-util/dbd/apr_dbd_sqlite3.c914
-rw-r--r--contrib/apr-util/dbd/unsupported/NWGNUdbdfreetds296
-rw-r--r--contrib/apr-util/dbd/unsupported/apr_dbd_freetds.c809
-rw-r--r--contrib/apr-util/dbm/NWGNUdbmdb299
-rw-r--r--contrib/apr-util/dbm/NWGNUdbmgdbm298
-rw-r--r--contrib/apr-util/dbm/NWGNUmakefile251
-rw-r--r--contrib/apr-util/dbm/apr_dbm.c307
-rw-r--r--contrib/apr-util/dbm/apr_dbm_berkeleydb.c404
-rw-r--r--contrib/apr-util/dbm/apr_dbm_gdbm.c255
-rw-r--r--contrib/apr-util/dbm/apr_dbm_ndbm.c238
-rw-r--r--contrib/apr-util/dbm/apr_dbm_sdbm.c223
-rw-r--r--contrib/apr-util/dbm/sdbm/sdbm.c584
-rw-r--r--contrib/apr-util/dbm/sdbm/sdbm_hash.c63
-rw-r--r--contrib/apr-util/dbm/sdbm/sdbm_lock.c79
-rw-r--r--contrib/apr-util/dbm/sdbm/sdbm_pair.c320
-rw-r--r--contrib/apr-util/dbm/sdbm/sdbm_pair.h40
-rw-r--r--contrib/apr-util/dbm/sdbm/sdbm_private.h84
-rw-r--r--contrib/apr-util/dbm/sdbm/sdbm_tune.h40
-rw-r--r--contrib/apr-util/docs/doxygen.conf32
-rw-r--r--contrib/apr-util/encoding/apr_base64.c268
-rw-r--r--contrib/apr-util/export_vars.sh.in13
-rw-r--r--contrib/apr-util/hooks/apr_hooks.c414
-rw-r--r--contrib/apr-util/include/apr_anylock.h128
-rw-r--r--contrib/apr-util/include/apr_base64.h113
-rw-r--r--contrib/apr-util/include/apr_buckets.h1598
-rw-r--r--contrib/apr-util/include/apr_crypto.h507
-rw-r--r--contrib/apr-util/include/apr_date.h106
-rw-r--r--contrib/apr-util/include/apr_dbd.h549
-rw-r--r--contrib/apr-util/include/apr_dbm.h227
-rw-r--r--contrib/apr-util/include/apr_hooks.h358
-rw-r--r--contrib/apr-util/include/apr_ldap.h.in197
-rw-r--r--contrib/apr-util/include/apr_ldap.hnw158
-rw-r--r--contrib/apr-util/include/apr_ldap.hw197
-rw-r--r--contrib/apr-util/include/apr_ldap.hwc197
-rw-r--r--contrib/apr-util/include/apr_ldap_init.h165
-rw-r--r--contrib/apr-util/include/apr_ldap_option.h254
-rw-r--r--contrib/apr-util/include/apr_ldap_rebind.h98
-rw-r--r--contrib/apr-util/include/apr_ldap_url.h120
-rw-r--r--contrib/apr-util/include/apr_md4.h135
-rw-r--r--contrib/apr-util/include/apr_md5.h176
-rw-r--r--contrib/apr-util/include/apr_memcache.h444
-rw-r--r--contrib/apr-util/include/apr_optional.h92
-rw-r--r--contrib/apr-util/include/apr_optional_hooks.h117
-rw-r--r--contrib/apr-util/include/apr_queue.h138
-rw-r--r--contrib/apr-util/include/apr_redis.h459
-rw-r--r--contrib/apr-util/include/apr_reslist.h183
-rw-r--r--contrib/apr-util/include/apr_rmm.h137
-rw-r--r--contrib/apr-util/include/apr_sdbm.h176
-rw-r--r--contrib/apr-util/include/apr_sha1.h121
-rw-r--r--contrib/apr-util/include/apr_siphash.h148
-rw-r--r--contrib/apr-util/include/apr_strmatch.h81
-rw-r--r--contrib/apr-util/include/apr_thread_pool.h299
-rw-r--r--contrib/apr-util/include/apr_uri.h178
-rw-r--r--contrib/apr-util/include/apr_uuid.h76
-rw-r--r--contrib/apr-util/include/apr_xlate.h163
-rw-r--r--contrib/apr-util/include/apr_xml.h358
-rw-r--r--contrib/apr-util/include/apu.h.in128
-rw-r--r--contrib/apr-util/include/apu.hnw124
-rw-r--r--contrib/apr-util/include/apu.hw146
-rw-r--r--contrib/apr-util/include/apu.hwc145
-rw-r--r--contrib/apr-util/include/apu_errno.h173
-rw-r--r--contrib/apr-util/include/apu_version.h139
-rw-r--r--contrib/apr-util/include/apu_want.h.in51
-rw-r--r--contrib/apr-util/include/apu_want.hnw52
-rw-r--r--contrib/apr-util/include/apu_want.hw52
-rw-r--r--contrib/apr-util/include/private/apr_crypto_internal.h297
-rw-r--r--contrib/apr-util/include/private/apr_dbd_internal.h365
-rw-r--r--contrib/apr-util/include/private/apr_dbd_odbc_v2.h119
-rw-r--r--contrib/apr-util/include/private/apr_dbm_private.h121
-rw-r--r--contrib/apr-util/include/private/apu_config.h.in183
-rw-r--r--contrib/apr-util/include/private/apu_config.hnw53
-rw-r--r--contrib/apr-util/include/private/apu_config.hw52
-rw-r--r--contrib/apr-util/include/private/apu_internal.h73
-rw-r--r--contrib/apr-util/include/private/apu_select_dbm.h.in28
-rw-r--r--contrib/apr-util/include/private/apu_select_dbm.hw28
-rw-r--r--contrib/apr-util/ldap/NWGNUmakefile263
-rw-r--r--contrib/apr-util/ldap/apr_ldap_init.c235
-rw-r--r--contrib/apr-util/ldap/apr_ldap_option.c652
-rw-r--r--contrib/apr-util/ldap/apr_ldap_rebind.c377
-rw-r--r--contrib/apr-util/ldap/apr_ldap_stub.c145
-rw-r--r--contrib/apr-util/ldap/apr_ldap_url.c694
-rw-r--r--contrib/apr-util/libaprutil.rc69
-rw-r--r--contrib/apr-util/memcache/apr_memcache.c1724
-rw-r--r--contrib/apr-util/misc/apr_date.c637
-rw-r--r--contrib/apr-util/misc/apr_queue.c398
-rw-r--r--contrib/apr-util/misc/apr_reslist.c473
-rw-r--r--contrib/apr-util/misc/apr_rmm.c457
-rw-r--r--contrib/apr-util/misc/apr_thread_pool.c956
-rw-r--r--contrib/apr-util/misc/apu_dso.c209
-rw-r--r--contrib/apr-util/misc/apu_version.c37
-rw-r--r--contrib/apr-util/redis/apr_redis.c1548
-rw-r--r--contrib/apr-util/renames_pending2
-rw-r--r--contrib/apr-util/strmatch/apr_strmatch.c118
-rw-r--r--contrib/apr-util/test/Makefile.in90
-rw-r--r--contrib/apr-util/test/Makefile.win171
-rw-r--r--contrib/apr-util/test/NWGNUaputest282
-rw-r--r--contrib/apr-util/test/NWGNUmakefile258
-rw-r--r--contrib/apr-util/test/abts.c423
-rw-r--r--contrib/apr-util/test/abts.h101
-rw-r--r--contrib/apr-util/test/abts_tests.h48
-rw-r--r--contrib/apr-util/test/data/billion-laughs.xml36
-rw-r--r--contrib/apr-util/test/dbd.c407
-rw-r--r--contrib/apr-util/test/nw_misc.c23
-rw-r--r--contrib/apr-util/test/test_apu.h100
-rw-r--r--contrib/apr-util/test/testall.dsw513
-rw-r--r--contrib/apr-util/test/testbuckets.c535
-rw-r--r--contrib/apr-util/test/testcrypto.c1545
-rw-r--r--contrib/apr-util/test/testdate.c202
-rw-r--r--contrib/apr-util/test/testdbd.c245
-rw-r--r--contrib/apr-util/test/testdbm.c221
-rw-r--r--contrib/apr-util/test/testldap.c250
-rw-r--r--contrib/apr-util/test/testmd4.c119
-rw-r--r--contrib/apr-util/test/testmd5.c103
-rw-r--r--contrib/apr-util/test/testmemcache.c626
-rw-r--r--contrib/apr-util/test/testpass.c217
-rw-r--r--contrib/apr-util/test/testqueue.c135
-rw-r--r--contrib/apr-util/test/testredis.c552
-rw-r--r--contrib/apr-util/test/testreslist.c272
-rw-r--r--contrib/apr-util/test/testrmm.c191
-rw-r--r--contrib/apr-util/test/testsiphash.c148
-rw-r--r--contrib/apr-util/test/teststrmatch.c92
-rw-r--r--contrib/apr-util/test/testuri.c331
-rw-r--r--contrib/apr-util/test/testutil.c60
-rw-r--r--contrib/apr-util/test/testutil.h73
-rw-r--r--contrib/apr-util/test/testuuid.c56
-rw-r--r--contrib/apr-util/test/testxlate.c134
-rw-r--r--contrib/apr-util/test/testxml.c205
-rw-r--r--contrib/apr-util/uri/apr_uri.c962
-rw-r--r--contrib/apr-util/xlate/xlate.c458
-rw-r--r--contrib/apr-util/xml/NWGNUmakefile259
-rw-r--r--contrib/apr-util/xml/apr_xml.c1078
-rw-r--r--contrib/apr/CHANGES82
-rw-r--r--contrib/apr/CMakeLists.txt431
-rw-r--r--contrib/apr/LICENSE341
-rw-r--r--contrib/apr/Makefile.in150
-rw-r--r--contrib/apr/Makefile.win171
-rw-r--r--contrib/apr/NOTICE15
-rw-r--r--contrib/apr/NWGNUmakefile434
-rw-r--r--contrib/apr/README167
-rw-r--r--contrib/apr/README.cmake112
-rw-r--r--contrib/apr/apr-config.in251
-rw-r--r--contrib/apr/apr.dep1916
-rw-r--r--contrib/apr/apr.dsp831
-rw-r--r--contrib/apr/apr.dsw101
-rw-r--r--contrib/apr/apr.mak1380
-rw-r--r--contrib/apr/apr.pc.in11
-rw-r--r--contrib/apr/apr.spec100
-rw-r--r--contrib/apr/atomic/unix/builtins.c81
-rw-r--r--contrib/apr/atomic/unix/builtins64.c64
-rw-r--r--contrib/apr/atomic/unix/ia32.c131
-rw-r--r--contrib/apr/atomic/unix/mutex.c206
-rw-r--r--contrib/apr/atomic/unix/mutex64.c178
-rw-r--r--contrib/apr/atomic/unix/ppc.c211
-rw-r--r--contrib/apr/atomic/unix/s390.c159
-rw-r--r--contrib/apr/atomic/unix/solaris.c83
-rw-r--r--contrib/apr/build-outputs.mk328
-rw-r--r--contrib/apr/build.conf29
-rwxr-xr-xcontrib/apr/buildconf136
-rw-r--r--contrib/apr/config.layout232
-rwxr-xr-xcontrib/apr/configure32465
-rw-r--r--contrib/apr/configure.in3020
-rw-r--r--contrib/apr/docs/APRDesign.html399
-rw-r--r--contrib/apr/docs/canonical_filenames.html156
-rw-r--r--contrib/apr/docs/doxygen.conf38
-rw-r--r--contrib/apr/docs/incomplete_types84
-rw-r--r--contrib/apr/docs/non_apr_programs47
-rw-r--r--contrib/apr/docs/pool-design.html96
-rw-r--r--contrib/apr/docs/win32_builds.html57
-rw-r--r--contrib/apr/dso/unix/dso.c251
-rw-r--r--contrib/apr/emacs-mode15
-rw-r--r--contrib/apr/encoding/apr_encode.c1419
-rw-r--r--contrib/apr/encoding/apr_escape.c1214
-rw-r--r--contrib/apr/file_io/unix/buffer.c60
-rw-r--r--contrib/apr/file_io/unix/copy.c119
-rw-r--r--contrib/apr/file_io/unix/dir.c373
-rw-r--r--contrib/apr/file_io/unix/fileacc.c119
-rw-r--r--contrib/apr/file_io/unix/filedup.c181
-rw-r--r--contrib/apr/file_io/unix/filepath.c314
-rw-r--r--contrib/apr/file_io/unix/filepath_util.c111
-rw-r--r--contrib/apr/file_io/unix/filestat.c339
-rw-r--r--contrib/apr/file_io/unix/flock.c120
-rw-r--r--contrib/apr/file_io/unix/fullrw.c111
-rw-r--r--contrib/apr/file_io/unix/mktemp.c223
-rw-r--r--contrib/apr/file_io/unix/open.c417
-rw-r--r--contrib/apr/file_io/unix/pipe.c292
-rw-r--r--contrib/apr/file_io/unix/readwrite.c528
-rw-r--r--contrib/apr/file_io/unix/seek.c136
-rw-r--r--contrib/apr/file_io/unix/tempdir.c129
-rwxr-xr-xcontrib/apr/helpers/apr_rename.pl106
-rw-r--r--contrib/apr/include/apr.h.in656
-rw-r--r--contrib/apr/include/apr.hnw445
-rw-r--r--contrib/apr/include/apr.hw667
-rw-r--r--contrib/apr/include/apr.hwc664
-rw-r--r--contrib/apr/include/apr_allocator.h179
-rw-r--r--contrib/apr/include/apr_atomic.h207
-rw-r--r--contrib/apr/include/apr_cstr.h292
-rw-r--r--contrib/apr/include/apr_dso.h94
-rw-r--r--contrib/apr/include/apr_encode.h569
-rw-r--r--contrib/apr/include/apr_env.h67
-rw-r--r--contrib/apr/include/apr_errno.h1342
-rw-r--r--contrib/apr/include/apr_escape.h431
-rw-r--r--contrib/apr/include/apr_file_info.h428
-rw-r--r--contrib/apr/include/apr_file_io.h1005
-rw-r--r--contrib/apr/include/apr_fnmatch.h153
-rw-r--r--contrib/apr/include/apr_general.h244
-rw-r--r--contrib/apr/include/apr_getopt.h160
-rw-r--r--contrib/apr/include/apr_global_mutex.h195
-rw-r--r--contrib/apr/include/apr_hash.h283
-rw-r--r--contrib/apr/include/apr_inherit.h51
-rw-r--r--contrib/apr/include/apr_lib.h241
-rw-r--r--contrib/apr/include/apr_mmap.h171
-rw-r--r--contrib/apr/include/apr_network_io.h951
-rw-r--r--contrib/apr/include/apr_perms_set.h65
-rw-r--r--contrib/apr/include/apr_poll.h446
-rw-r--r--contrib/apr/include/apr_pools.h815
-rw-r--r--contrib/apr/include/apr_portable.h549
-rw-r--r--contrib/apr/include/apr_proc_mutex.h192
-rw-r--r--contrib/apr/include/apr_random.h153
-rw-r--r--contrib/apr/include/apr_ring.h513
-rw-r--r--contrib/apr/include/apr_shm.h229
-rw-r--r--contrib/apr/include/apr_signal.h109
-rw-r--r--contrib/apr/include/apr_skiplist.h381
-rw-r--r--contrib/apr/include/apr_strings.h380
-rw-r--r--contrib/apr/include/apr_support.h57
-rw-r--r--contrib/apr/include/apr_tables.h507
-rw-r--r--contrib/apr/include/apr_thread_cond.h139
-rw-r--r--contrib/apr/include/apr_thread_mutex.h123
-rw-r--r--contrib/apr/include/apr_thread_proc.h846
-rw-r--r--contrib/apr/include/apr_thread_rwlock.h129
-rw-r--r--contrib/apr/include/apr_time.h237
-rw-r--r--contrib/apr/include/apr_user.h158
-rw-r--r--contrib/apr/include/apr_version.h164
-rw-r--r--contrib/apr/include/apr_want.h124
-rw-r--r--contrib/apr/include/arch/apr_private_common.h41
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_atomic.h53
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_dso.h63
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_file_io.h174
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_global_mutex.h37
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_inherit.h64
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_internal_time.h24
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_misc.h67
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_networkio.h145
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_poll_private.h189
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_proc_mutex.h121
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_shm.h74
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_thread_cond.h42
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_thread_mutex.h42
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_thread_rwlock.h49
-rw-r--r--contrib/apr/include/arch/unix/apr_arch_threadproc.h119
-rw-r--r--contrib/apr/include/arch/unix/apr_private.h.in1075
-rw-r--r--contrib/apr/include/private/apr_encode_private.h84
-rw-r--r--contrib/apr/libapr.dep1920
-rw-r--r--contrib/apr/libapr.dsp868
-rw-r--r--contrib/apr/libapr.mak1609
-rw-r--r--contrib/apr/libapr.rc64
-rw-r--r--contrib/apr/locks/unix/global_mutex.c245
-rw-r--r--contrib/apr/locks/unix/proc_mutex.c1695
-rw-r--r--contrib/apr/locks/unix/thread_cond.c145
-rw-r--r--contrib/apr/locks/unix/thread_mutex.c334
-rw-r--r--contrib/apr/locks/unix/thread_rwlock.c181
-rw-r--r--contrib/apr/memory/unix/apr_pools.c2932
-rw-r--r--contrib/apr/misc/unix/charset.c83
-rw-r--r--contrib/apr/misc/unix/env.c88
-rw-r--r--contrib/apr/misc/unix/errorcodes.c443
-rw-r--r--contrib/apr/misc/unix/getopt.c309
-rw-r--r--contrib/apr/misc/unix/otherchild.c221
-rw-r--r--contrib/apr/misc/unix/rand.c302
-rw-r--r--contrib/apr/misc/unix/randbyte_os2.inc123
-rw-r--r--contrib/apr/misc/unix/start.c89
-rw-r--r--contrib/apr/misc/unix/version.c35
-rw-r--r--contrib/apr/mmap/unix/common.c43
-rw-r--r--contrib/apr/mmap/unix/mmap.c172
-rw-r--r--contrib/apr/network_io/unix/inet_ntop.c243
-rw-r--r--contrib/apr/network_io/unix/inet_pton.c240
-rw-r--r--contrib/apr/network_io/unix/multicast.c313
-rw-r--r--contrib/apr/network_io/unix/sendrecv.c1110
-rw-r--r--contrib/apr/network_io/unix/sockaddr.c1284
-rw-r--r--contrib/apr/network_io/unix/socket_util.c75
-rw-r--r--contrib/apr/network_io/unix/sockets.c572
-rw-r--r--contrib/apr/network_io/unix/sockopt.c465
-rw-r--r--contrib/apr/passwd/apr_getpass.c256
-rw-r--r--contrib/apr/poll/unix/epoll.c490
-rw-r--r--contrib/apr/poll/unix/kqueue.c505
-rw-r--r--contrib/apr/poll/unix/poll.c460
-rw-r--r--contrib/apr/poll/unix/pollcb.c224
-rw-r--r--contrib/apr/poll/unix/pollset.c247
-rw-r--r--contrib/apr/poll/unix/port.c594
-rw-r--r--contrib/apr/poll/unix/select.c449
-rw-r--r--contrib/apr/poll/unix/wakeup.c151
-rw-r--r--contrib/apr/poll/unix/z_asio.c782
-rw-r--r--contrib/apr/random/unix/apr_random.c88
-rw-r--r--contrib/apr/random/unix/sha2.c528
-rw-r--r--contrib/apr/random/unix/sha2.h59
-rw-r--r--contrib/apr/random/unix/sha2_glue.c49
-rw-r--r--contrib/apr/shmem/unix/shm.c731
-rw-r--r--contrib/apr/strings/apr_cpystrn.c315
-rw-r--r--contrib/apr/strings/apr_cstr.c403
-rw-r--r--contrib/apr/strings/apr_fnmatch.c482
-rw-r--r--contrib/apr/strings/apr_snprintf.c1407
-rw-r--r--contrib/apr/strings/apr_strings.c467
-rw-r--r--contrib/apr/strings/apr_strnatcmp.c149
-rw-r--r--contrib/apr/strings/apr_strtok.c56
-rw-r--r--contrib/apr/support/unix/waitio.c123
-rw-r--r--contrib/apr/tables/apr_hash.c552
-rw-r--r--contrib/apr/tables/apr_skiplist.c852
-rw-r--r--contrib/apr/tables/apr_tables.c1300
-rw-r--r--contrib/apr/threadproc/unix/proc.c739
-rw-r--r--contrib/apr/threadproc/unix/procsup.c104
-rw-r--r--contrib/apr/threadproc/unix/signals.c481
-rw-r--r--contrib/apr/threadproc/unix/thread.c334
-rw-r--r--contrib/apr/threadproc/unix/threadpriv.c129
-rw-r--r--contrib/apr/time/unix/time.c349
-rw-r--r--contrib/apr/time/unix/timestr.c153
-rw-r--r--contrib/apr/tools/gen_test_char.c131
-rw-r--r--contrib/apr/user/unix/groupinfo.c87
-rw-r--r--contrib/apr/user/unix/userinfo.c146
-rw-r--r--contrib/serf/CHANGES310
-rw-r--r--contrib/serf/LICENSE201
-rw-r--r--contrib/serf/NOTICE7
-rw-r--r--contrib/serf/README92
-rw-r--r--contrib/serf/SConstruct505
-rw-r--r--contrib/serf/STATUS19
-rw-r--r--contrib/serf/auth/auth.c490
-rw-r--r--contrib/serf/auth/auth.h130
-rw-r--r--contrib/serf/auth/auth_basic.c182
-rw-r--r--contrib/serf/auth/auth_digest.c562
-rw-r--r--contrib/serf/auth/auth_spnego.c662
-rw-r--r--contrib/serf/auth/auth_spnego.h121
-rw-r--r--contrib/serf/auth/auth_spnego_gss.c231
-rw-r--r--contrib/serf/auth/auth_spnego_sspi.c303
-rw-r--r--contrib/serf/buckets/aggregate_buckets.c493
-rw-r--r--contrib/serf/buckets/allocator.c439
-rw-r--r--contrib/serf/buckets/barrier_buckets.c102
-rw-r--r--contrib/serf/buckets/buckets.c645
-rw-r--r--contrib/serf/buckets/bwtp_buckets.c601
-rw-r--r--contrib/serf/buckets/chunk_buckets.c240
-rw-r--r--contrib/serf/buckets/dechunk_buckets.c204
-rw-r--r--contrib/serf/buckets/deflate_buckets.c408
-rw-r--r--contrib/serf/buckets/file_buckets.c122
-rw-r--r--contrib/serf/buckets/headers_buckets.c461
-rw-r--r--contrib/serf/buckets/iovec_buckets.c174
-rw-r--r--contrib/serf/buckets/limit_buckets.c132
-rw-r--r--contrib/serf/buckets/mmap_buckets.c145
-rw-r--r--contrib/serf/buckets/request_buckets.c242
-rw-r--r--contrib/serf/buckets/response_body_buckets.c140
-rw-r--r--contrib/serf/buckets/response_buckets.c503
-rw-r--r--contrib/serf/buckets/simple_buckets.c164
-rw-r--r--contrib/serf/buckets/socket_buckets.c130
-rw-r--r--contrib/serf/buckets/ssl_buckets.c1988
-rwxr-xr-xcontrib/serf/build/check.py67
-rwxr-xr-xcontrib/serf/build/gen_def.py78
-rw-r--r--contrib/serf/build/serf.pc.in13
-rw-r--r--contrib/serf/context.c390
-rw-r--r--contrib/serf/design-guide.txt152
-rw-r--r--contrib/serf/incoming.c181
-rw-r--r--contrib/serf/outgoing.c1754
-rw-r--r--contrib/serf/serf.h1122
-rw-r--r--contrib/serf/serf_bucket_types.h693
-rw-r--r--contrib/serf/serf_bucket_util.h299
-rw-r--r--contrib/serf/serf_private.h470
-rw-r--r--contrib/serf/ssltunnel.c200
-rw-r--r--contrib/subversion/.editorconfig20
-rw-r--r--contrib/subversion/.ycm_extra_conf.py88
-rw-r--r--contrib/subversion/BUGS2
-rw-r--r--contrib/subversion/CHANGES7314
-rw-r--r--contrib/subversion/COMMITTERS246
-rw-r--r--contrib/subversion/INSTALL1470
-rw-r--r--contrib/subversion/LICENSE446
-rw-r--r--contrib/subversion/Makefile.in1044
-rw-r--r--contrib/subversion/NOTICE34
-rw-r--r--contrib/subversion/README84
-rw-r--r--contrib/subversion/aclocal.m461
-rwxr-xr-xcontrib/subversion/autogen.sh247
-rw-r--r--contrib/subversion/build-outputs.mk3630
-rw-r--r--contrib/subversion/build.conf1767
-rwxr-xr-xcontrib/subversion/configure30335
-rw-r--r--contrib/subversion/configure.ac1686
-rw-r--r--contrib/subversion/doc/README28
-rw-r--r--contrib/subversion/doc/doxygen.conf1488
-rw-r--r--contrib/subversion/doc/programmer/WritingChangeLogs.txt220
-rw-r--r--contrib/subversion/doc/user/cvs-crossover-guide.html906
-rw-r--r--contrib/subversion/doc/user/lj_article.txt323
-rw-r--r--contrib/subversion/doc/user/svn-best-practices.html318
-rw-r--r--contrib/subversion/gen-make.opts2
-rwxr-xr-xcontrib/subversion/gen-make.py329
-rwxr-xr-xcontrib/subversion/get-deps.sh176
-rw-r--r--contrib/subversion/subversion/include/mod_authz_svn.h61
-rw-r--r--contrib/subversion/subversion/include/mod_dav_svn.h132
-rw-r--r--contrib/subversion/subversion/include/private/README4
-rw-r--r--contrib/subversion/subversion/include/private/ra_svn_sasl.h80
-rw-r--r--contrib/subversion/subversion/include/private/ra_svn_wrapped_sasl.h131
-rw-r--r--contrib/subversion/subversion/include/private/svn_adler32.h52
-rw-r--r--contrib/subversion/subversion/include/private/svn_atomic.h158
-rw-r--r--contrib/subversion/subversion/include/private/svn_auth_private.h267
-rw-r--r--contrib/subversion/subversion/include/private/svn_branch.h679
-rw-r--r--contrib/subversion/subversion/include/private/svn_branch_compat.h273
-rw-r--r--contrib/subversion/subversion/include/private/svn_branch_impl.h197
-rw-r--r--contrib/subversion/subversion/include/private/svn_branch_nested.h216
-rw-r--r--contrib/subversion/subversion/include/private/svn_branch_repos.h104
-rw-r--r--contrib/subversion/subversion/include/private/svn_cache.h580
-rw-r--r--contrib/subversion/subversion/include/private/svn_cert.h68
-rw-r--r--contrib/subversion/subversion/include/private/svn_client_mtcc.h237
-rw-r--r--contrib/subversion/subversion/include/private/svn_client_private.h542
-rw-r--r--contrib/subversion/subversion/include/private/svn_client_shelf.h498
-rw-r--r--contrib/subversion/subversion/include/private/svn_client_shelf2.h467
-rw-r--r--contrib/subversion/subversion/include/private/svn_cmdline_private.h285
-rw-r--r--contrib/subversion/subversion/include/private/svn_config_private.h129
-rw-r--r--contrib/subversion/subversion/include/private/svn_dav_protocol.h68
-rw-r--r--contrib/subversion/subversion/include/private/svn_debug.h107
-rw-r--r--contrib/subversion/subversion/include/private/svn_delta_private.h134
-rw-r--r--contrib/subversion/subversion/include/private/svn_dep_compat.h211
-rw-r--r--contrib/subversion/subversion/include/private/svn_diff_private.h155
-rw-r--r--contrib/subversion/subversion/include/private/svn_diff_tree.h373
-rw-r--r--contrib/subversion/subversion/include/private/svn_dirent_uri_private.h53
-rw-r--r--contrib/subversion/subversion/include/private/svn_doxygen.h32
-rw-r--r--contrib/subversion/subversion/include/private/svn_editor.h1135
-rw-r--r--contrib/subversion/subversion/include/private/svn_element.h399
-rw-r--r--contrib/subversion/subversion/include/private/svn_eol_private.h93
-rw-r--r--contrib/subversion/subversion/include/private/svn_error_private.h54
-rw-r--r--contrib/subversion/subversion/include/private/svn_fs_fs_private.h371
-rw-r--r--contrib/subversion/subversion/include/private/svn_fs_private.h222
-rw-r--r--contrib/subversion/subversion/include/private/svn_fs_util.h251
-rw-r--r--contrib/subversion/subversion/include/private/svn_fspath.h175
-rw-r--r--contrib/subversion/subversion/include/private/svn_io_private.h182
-rw-r--r--contrib/subversion/subversion/include/private/svn_log.h271
-rw-r--r--contrib/subversion/subversion/include/private/svn_magic.h57
-rw-r--r--contrib/subversion/subversion/include/private/svn_mergeinfo_private.h294
-rw-r--r--contrib/subversion/subversion/include/private/svn_mutex.h122
-rw-r--r--contrib/subversion/subversion/include/private/svn_object_pool.h119
-rw-r--r--contrib/subversion/subversion/include/private/svn_opt_private.h152
-rw-r--r--contrib/subversion/subversion/include/private/svn_packed_data.h260
-rw-r--r--contrib/subversion/subversion/include/private/svn_ra_private.h315
-rw-r--r--contrib/subversion/subversion/include/private/svn_ra_svn_private.h1060
-rw-r--r--contrib/subversion/subversion/include/private/svn_repos_private.h397
-rw-r--r--contrib/subversion/subversion/include/private/svn_skel.h236
-rw-r--r--contrib/subversion/subversion/include/private/svn_sorts_private.h230
-rw-r--r--contrib/subversion/subversion/include/private/svn_sqlite.h571
-rw-r--r--contrib/subversion/subversion/include/private/svn_string_private.h336
-rw-r--r--contrib/subversion/subversion/include/private/svn_subr_private.h753
-rw-r--r--contrib/subversion/subversion/include/private/svn_temp_serializer.h223
-rw-r--r--contrib/subversion/subversion/include/private/svn_token.h98
-rw-r--r--contrib/subversion/subversion/include/private/svn_utf_private.h295
-rw-r--r--contrib/subversion/subversion/include/private/svn_wc_private.h2135
-rw-r--r--contrib/subversion/subversion/include/svn_auth.h1327
-rw-r--r--contrib/subversion/subversion/include/svn_base64.h138
-rw-r--r--contrib/subversion/subversion/include/svn_cache_config.h95
-rw-r--r--contrib/subversion/subversion/include/svn_checksum.h301
-rw-r--r--contrib/subversion/subversion/include/svn_client.h7835
-rw-r--r--contrib/subversion/subversion/include/svn_cmdline.h420
-rw-r--r--contrib/subversion/subversion/include/svn_compat.h116
-rw-r--r--contrib/subversion/subversion/include/svn_config.h915
-rw-r--r--contrib/subversion/subversion/include/svn_ctype.h196
-rw-r--r--contrib/subversion/subversion/include/svn_dav.h433
-rw-r--r--contrib/subversion/subversion/include/svn_delta.h1578
-rw-r--r--contrib/subversion/subversion/include/svn_diff.h1377
-rw-r--r--contrib/subversion/subversion/include/svn_dirent_uri.h927
-rw-r--r--contrib/subversion/subversion/include/svn_dso.h99
-rw-r--r--contrib/subversion/subversion/include/svn_error.h703
-rw-r--r--contrib/subversion/subversion/include/svn_error_codes.h1805
-rw-r--r--contrib/subversion/subversion/include/svn_fs.h3560
-rw-r--r--contrib/subversion/subversion/include/svn_hash.h289
-rw-r--r--contrib/subversion/subversion/include/svn_io.h2644
-rw-r--r--contrib/subversion/subversion/include/svn_iter.h139
-rw-r--r--contrib/subversion/subversion/include/svn_md5.h91
-rw-r--r--contrib/subversion/subversion/include/svn_mergeinfo.h641
-rw-r--r--contrib/subversion/subversion/include/svn_nls.h56
-rw-r--r--contrib/subversion/subversion/include/svn_opt.h877
-rw-r--r--contrib/subversion/subversion/include/svn_opt_impl.h86
-rw-r--r--contrib/subversion/subversion/include/svn_path.h736
-rw-r--r--contrib/subversion/subversion/include/svn_pools.h114
-rw-r--r--contrib/subversion/subversion/include/svn_props.h748
-rw-r--r--contrib/subversion/subversion/include/svn_quoprint.h77
-rw-r--r--contrib/subversion/subversion/include/svn_ra.h2657
-rw-r--r--contrib/subversion/subversion/include/svn_ra_svn.h737
-rw-r--r--contrib/subversion/subversion/include/svn_repos.h4403
-rw-r--r--contrib/subversion/subversion/include/svn_sorts.h147
-rw-r--r--contrib/subversion/subversion/include/svn_string.h693
-rw-r--r--contrib/subversion/subversion/include/svn_subst.h708
-rw-r--r--contrib/subversion/subversion/include/svn_time.h101
-rw-r--r--contrib/subversion/subversion/include/svn_types.h1284
-rw-r--r--contrib/subversion/subversion/include/svn_types_impl.h157
-rw-r--r--contrib/subversion/subversion/include/svn_user.h59
-rw-r--r--contrib/subversion/subversion/include/svn_utf.h252
-rw-r--r--contrib/subversion/subversion/include/svn_version.h452
-rw-r--r--contrib/subversion/subversion/include/svn_wc.h8470
-rw-r--r--contrib/subversion/subversion/include/svn_x509.h201
-rw-r--r--contrib/subversion/subversion/include/svn_xml.h389
-rw-r--r--contrib/subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c551
-rw-r--r--contrib/subversion/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_auth_gnome_keyring/version.c35
-rw-r--r--contrib/subversion/subversion/libsvn_auth_kwallet/kwallet.cpp471
-rw-r--r--contrib/subversion/subversion/libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_auth_kwallet/version.c35
-rw-r--r--contrib/subversion/subversion/libsvn_client/add.c1282
-rw-r--r--contrib/subversion/subversion/libsvn_client/blame.c984
-rw-r--r--contrib/subversion/subversion/libsvn_client/cat.c337
-rw-r--r--contrib/subversion/subversion/libsvn_client/changelist.c144
-rw-r--r--contrib/subversion/subversion/libsvn_client/checkout.c229
-rw-r--r--contrib/subversion/subversion/libsvn_client/cleanup.c265
-rw-r--r--contrib/subversion/subversion/libsvn_client/client.h1243
-rw-r--r--contrib/subversion/subversion/libsvn_client/cmdline.c372
-rw-r--r--contrib/subversion/subversion/libsvn_client/commit.c1088
-rw-r--r--contrib/subversion/subversion/libsvn_client/commit_util.c2088
-rw-r--r--contrib/subversion/subversion/libsvn_client/compat_providers.c140
-rw-r--r--contrib/subversion/subversion/libsvn_client/conflicts.c13527
-rw-r--r--contrib/subversion/subversion/libsvn_client/copy.c3488
-rw-r--r--contrib/subversion/subversion/libsvn_client/ctx.c135
-rw-r--r--contrib/subversion/subversion/libsvn_client/delete.c604
-rw-r--r--contrib/subversion/subversion/libsvn_client/deprecated.c3263
-rw-r--r--contrib/subversion/subversion/libsvn_client/diff.c2948
-rw-r--r--contrib/subversion/subversion/libsvn_client/diff_local.c741
-rw-r--r--contrib/subversion/subversion/libsvn_client/diff_summarize.c301
-rw-r--r--contrib/subversion/subversion/libsvn_client/export.c1591
-rw-r--r--contrib/subversion/subversion/libsvn_client/externals.c1281
-rw-r--r--contrib/subversion/subversion/libsvn_client/import.c1041
-rw-r--r--contrib/subversion/subversion/libsvn_client/info.c490
-rw-r--r--contrib/subversion/subversion/libsvn_client/iprops.c272
-rw-r--r--contrib/subversion/subversion/libsvn_client/layout.c289
-rw-r--r--contrib/subversion/subversion/libsvn_client/libsvn_client.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_client/list.c585
-rw-r--r--contrib/subversion/subversion/libsvn_client/locking_commands.c649
-rw-r--r--contrib/subversion/subversion/libsvn_client/log.c950
-rw-r--r--contrib/subversion/subversion/libsvn_client/merge.c12946
-rw-r--r--contrib/subversion/subversion/libsvn_client/merge_elements.c248
-rw-r--r--contrib/subversion/subversion/libsvn_client/mergeinfo.c2325
-rw-r--r--contrib/subversion/subversion/libsvn_client/mergeinfo.h412
-rw-r--r--contrib/subversion/subversion/libsvn_client/mtcc.c1487
-rw-r--r--contrib/subversion/subversion/libsvn_client/patch.c3784
-rw-r--r--contrib/subversion/subversion/libsvn_client/prop_commands.c1573
-rw-r--r--contrib/subversion/subversion/libsvn_client/ra.c1200
-rw-r--r--contrib/subversion/subversion/libsvn_client/relocate.c248
-rw-r--r--contrib/subversion/subversion/libsvn_client/repos_diff.c1406
-rw-r--r--contrib/subversion/subversion/libsvn_client/resolved.c147
-rw-r--r--contrib/subversion/subversion/libsvn_client/revert.c209
-rw-r--r--contrib/subversion/subversion/libsvn_client/revisions.c197
-rw-r--r--contrib/subversion/subversion/libsvn_client/shelf.c1274
-rw-r--r--contrib/subversion/subversion/libsvn_client/shelf2.c2124
-rw-r--r--contrib/subversion/subversion/libsvn_client/status.c856
-rw-r--r--contrib/subversion/subversion/libsvn_client/switch.c485
-rw-r--r--contrib/subversion/subversion/libsvn_client/update.c831
-rw-r--r--contrib/subversion/subversion/libsvn_client/upgrade.c415
-rw-r--r--contrib/subversion/subversion/libsvn_client/url.c63
-rw-r--r--contrib/subversion/subversion/libsvn_client/util.c471
-rw-r--r--contrib/subversion/subversion/libsvn_client/version.c33
-rw-r--r--contrib/subversion/subversion/libsvn_client/wc_editor.c655
-rw-r--r--contrib/subversion/subversion/libsvn_delta/branch.c1699
-rw-r--r--contrib/subversion/subversion/libsvn_delta/branch_compat.c2072
-rw-r--r--contrib/subversion/subversion/libsvn_delta/branch_migrate.c366
-rw-r--r--contrib/subversion/subversion/libsvn_delta/branch_nested.c660
-rw-r--r--contrib/subversion/subversion/libsvn_delta/branch_repos.c132
-rw-r--r--contrib/subversion/subversion/libsvn_delta/cancel.c399
-rw-r--r--contrib/subversion/subversion/libsvn_delta/compat.c2037
-rw-r--r--contrib/subversion/subversion/libsvn_delta/compose_delta.c839
-rw-r--r--contrib/subversion/subversion/libsvn_delta/debug_editor.c501
-rw-r--r--contrib/subversion/subversion/libsvn_delta/default_editor.c189
-rw-r--r--contrib/subversion/subversion/libsvn_delta/delta.h96
-rw-r--r--contrib/subversion/subversion/libsvn_delta/deprecated.c121
-rw-r--r--contrib/subversion/subversion/libsvn_delta/depth_filter_editor.c485
-rw-r--r--contrib/subversion/subversion/libsvn_delta/editor.c895
-rw-r--r--contrib/subversion/subversion/libsvn_delta/element.c469
-rw-r--r--contrib/subversion/subversion/libsvn_delta/libsvn_delta.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_delta/path_driver.c358
-rw-r--r--contrib/subversion/subversion/libsvn_delta/svndiff.c1101
-rw-r--r--contrib/subversion/subversion/libsvn_delta/text_delta.c994
-rw-r--r--contrib/subversion/subversion/libsvn_delta/version.c33
-rw-r--r--contrib/subversion/subversion/libsvn_delta/xdelta.c496
-rw-r--r--contrib/subversion/subversion/libsvn_diff/binary_diff.c281
-rw-r--r--contrib/subversion/subversion/libsvn_diff/deprecated.c464
-rw-r--r--contrib/subversion/subversion/libsvn_diff/diff.c199
-rw-r--r--contrib/subversion/subversion/libsvn_diff/diff.h227
-rw-r--r--contrib/subversion/subversion/libsvn_diff/diff3.c532
-rw-r--r--contrib/subversion/subversion/libsvn_diff/diff4.c314
-rw-r--r--contrib/subversion/subversion/libsvn_diff/diff_file.c2492
-rw-r--r--contrib/subversion/subversion/libsvn_diff/diff_memory.c1129
-rw-r--r--contrib/subversion/subversion/libsvn_diff/diff_tree.c1658
-rw-r--r--contrib/subversion/subversion/libsvn_diff/lcs.c375
-rw-r--r--contrib/subversion/subversion/libsvn_diff/libsvn_diff.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_diff/parse-diff.c2379
-rw-r--r--contrib/subversion/subversion/libsvn_diff/token.c198
-rw-r--r--contrib/subversion/subversion/libsvn_diff/util.c623
-rw-r--r--contrib/subversion/subversion/libsvn_fs/access.c98
-rw-r--r--contrib/subversion/subversion/libsvn_fs/deprecated.c247
-rw-r--r--contrib/subversion/subversion/libsvn_fs/editor.c838
-rw-r--r--contrib/subversion/subversion/libsvn_fs/fs-loader.c2262
-rw-r--r--contrib/subversion/subversion/libsvn_fs/fs-loader.h602
-rw-r--r--contrib/subversion/subversion/libsvn_fs/libsvn_fs.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/bdb-err.c106
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/bdb-err.h115
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/bdb_compat.c34
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/bdb_compat.h135
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/changes-table.c482
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/changes-table.h94
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/checksum-reps-table.c208
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/checksum-reps-table.h89
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/copies-table.c210
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/copies-table.h93
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/dbt.c170
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/dbt.h120
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/env.c719
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/env.h159
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/lock-tokens-table.c157
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/lock-tokens-table.h96
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/locks-table.c328
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/locks-table.h110
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/miscellaneous-table.c135
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/miscellaneous-table.h71
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/node-origins-table.c145
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/node-origins-table.h76
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/nodes-table.c259
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/nodes-table.h121
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/reps-table.c204
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/reps-table.h94
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/rev-table.c224
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/rev-table.h85
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/strings-table.c541
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/strings-table.h143
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/txn-table.c325
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/txn-table.h100
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/uuids-table.c149
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/bdb/uuids-table.h69
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/dag.c1771
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/dag.h587
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/err.c177
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/err.h98
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/fs.c1547
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/fs.h361
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/fs_init.h33
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/id.c209
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/id.h81
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/key-gen.c119
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/key-gen.h93
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/libsvn_fs_base.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/lock.c670
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/lock.h127
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/node-rev.c126
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/node-rev.h101
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/notes/TODO137
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/notes/fs-history270
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/notes/structure1086
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/reps-strings.c1618
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/reps-strings.h176
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/revs-txns.c1102
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/revs-txns.h235
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/trail.c292
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/trail.h239
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/tree.c5605
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/tree.h99
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/util/fs_skels.c1515
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/util/fs_skels.h177
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/uuid.c116
-rw-r--r--contrib/subversion/subversion/libsvn_fs_base/uuid.h49
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/cached_data.c3806
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/cached_data.h191
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/caching.c899
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/dag.c1428
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/dag.h589
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/dump-index.c90
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/fs.c710
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/fs.h705
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c2515
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/fs_fs.h378
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/fs_init.h32
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/hotcopy.c1100
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/hotcopy.h47
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/id.c646
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/id.h163
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/index.c3471
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/index.h356
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/libsvn_fs_fs.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/load-index.c174
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/lock.c1367
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/lock.h110
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/low_level.c1330
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/low_level.h235
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/pack.c2168
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/pack.h70
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/recovery.c513
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/recovery.h36
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h106
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.sql95
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c423
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/rep-cache.h107
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/rev_file.c307
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/rev_file.h145
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/revprops.c1579
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/revprops.h180
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/stats.c1492
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/structure771
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/structure-indexes354
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/temp_serializer.c1429
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/temp_serializer.h427
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/transaction.c4235
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/transaction.h294
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/tree.c4882
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/tree.h111
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/util.c681
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/util.h403
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/verify.c923
-rw-r--r--contrib/subversion/subversion/libsvn_fs_fs/verify.h42
-rw-r--r--contrib/subversion/subversion/libsvn_fs_util/fs-util.c349
-rw-r--r--contrib/subversion/subversion/libsvn_fs_util/libsvn_fs_util.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/TODO270
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/batch_fsync.c588
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/batch_fsync.h92
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/cached_data.c3536
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/cached_data.h203
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/caching.c682
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/changes.c535
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/changes.h148
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/dag.c1083
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/dag.h540
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/dag_cache.c1103
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/dag_cache.h174
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/fs.c674
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/fs.h575
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/fs_id.c319
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/fs_id.h62
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/fs_init.h33
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/fs_x.c1295
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/fs_x.h220
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/hotcopy.c792
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/hotcopy.h48
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/id.c198
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/id.h135
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/index.c3933
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/index.h433
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/libsvn_fs_x.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/lock.c1388
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/lock.h116
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/low_level.c1244
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/low_level.h236
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/noderevs.c913
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/noderevs.h142
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/pack.c2277
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/pack.h60
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/recovery.c351
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/recovery.h37
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h92
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.sql70
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/rep-cache.c440
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/rep-cache.h110
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/reps.c949
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/reps.h190
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/rev_file.c539
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/rev_file.h200
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/revprops.c1685
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/revprops.h128
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/string_table.c906
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/string_table.h133
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/structure336
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/temp_serializer.c1185
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/temp_serializer.h313
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/transaction.c4207
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/transaction.h315
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/tree.c3502
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/tree.h117
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/util.c733
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/util.h460
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/verify.c850
-rw-r--r--contrib/subversion/subversion/libsvn_fs_x/verify.h43
-rw-r--r--contrib/subversion/subversion/libsvn_ra/compat.c954
-rw-r--r--contrib/subversion/subversion/libsvn_ra/debug_reporter.c151
-rw-r--r--contrib/subversion/subversion/libsvn_ra/debug_reporter.h49
-rw-r--r--contrib/subversion/subversion/libsvn_ra/deprecated.c522
-rw-r--r--contrib/subversion/subversion/libsvn_ra/deprecated.h60
-rw-r--r--contrib/subversion/subversion/libsvn_ra/editor.c339
-rw-r--r--contrib/subversion/subversion/libsvn_ra/libsvn_ra.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_ra/ra_loader.c1601
-rw-r--r--contrib/subversion/subversion/libsvn_ra/ra_loader.h601
-rw-r--r--contrib/subversion/subversion/libsvn_ra/util.c280
-rw-r--r--contrib/subversion/subversion/libsvn_ra/wrapper_template.h514
-rw-r--r--contrib/subversion/subversion/libsvn_ra_local/libsvn_ra_local.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_ra_local/ra_local.h102
-rw-r--r--contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c1971
-rw-r--r--contrib/subversion/subversion/libsvn_ra_local/split_url.c105
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/blame.c399
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/blncache.c179
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/blncache.h90
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/commit.c2534
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/eagain_bucket.c127
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/get_deleted_rev.c178
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/get_file.c430
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/get_lock.c337
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/getdate.c171
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/getlocations.c200
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/getlocationsegments.c206
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/getlocks.c300
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c442
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/libsvn_ra_serf.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/list.c288
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/lock.c685
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/log.c605
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/merge.c469
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/mergeinfo.c238
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/multistatus.c759
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/options.c799
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/property.c922
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h1673
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/replay.c833
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/request_body.c232
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/sb_bucket.c190
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/serf.c1130
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/stat.c562
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/stream_bucket.c120
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/update.c2857
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/util.c2154
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/util_error.c101
-rw-r--r--contrib/subversion/subversion/libsvn_ra_serf/xml.c1030
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/client.c3345
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/cram.c221
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/cyrus_auth.c966
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/deprecated.c321
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/editorp.c1225
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/internal_auth.c121
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/libsvn_ra_svn.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/marshal.c3149
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/protocol662
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/ra_svn.h283
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/streams.c232
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/version.c33
-rw-r--r--contrib/subversion/subversion/libsvn_ra_svn/wrapped_sasl.c197
-rw-r--r--contrib/subversion/subversion/libsvn_repos/authz.c1757
-rw-r--r--contrib/subversion/subversion/libsvn_repos/authz.h375
-rw-r--r--contrib/subversion/subversion/libsvn_repos/authz_info.c197
-rw-r--r--contrib/subversion/subversion/libsvn_repos/authz_parse.c1518
-rw-r--r--contrib/subversion/subversion/libsvn_repos/commit.c1443
-rw-r--r--contrib/subversion/subversion/libsvn_repos/compat.c179
-rw-r--r--contrib/subversion/subversion/libsvn_repos/config_file.c390
-rw-r--r--contrib/subversion/subversion/libsvn_repos/config_file.h74
-rw-r--r--contrib/subversion/subversion/libsvn_repos/config_pool.c148
-rw-r--r--contrib/subversion/subversion/libsvn_repos/delta.c991
-rw-r--r--contrib/subversion/subversion/libsvn_repos/deprecated.c1331
-rw-r--r--contrib/subversion/subversion/libsvn_repos/dump.c2578
-rw-r--r--contrib/subversion/subversion/libsvn_repos/dump_editor.c1040
-rw-r--r--contrib/subversion/subversion/libsvn_repos/fs-wrap.c1124
-rw-r--r--contrib/subversion/subversion/libsvn_repos/hooks.c902
-rw-r--r--contrib/subversion/subversion/libsvn_repos/libsvn_repos.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_repos/list.c340
-rw-r--r--contrib/subversion/subversion/libsvn_repos/load-fs-vtable.c1537
-rw-r--r--contrib/subversion/subversion/libsvn_repos/load.c834
-rw-r--r--contrib/subversion/subversion/libsvn_repos/log.c2467
-rw-r--r--contrib/subversion/subversion/libsvn_repos/node_tree.c431
-rw-r--r--contrib/subversion/subversion/libsvn_repos/notify.c44
-rw-r--r--contrib/subversion/subversion/libsvn_repos/replay.c1573
-rw-r--r--contrib/subversion/subversion/libsvn_repos/reporter.c1641
-rw-r--r--contrib/subversion/subversion/libsvn_repos/repos.c2094
-rw-r--r--contrib/subversion/subversion/libsvn_repos/repos.h394
-rw-r--r--contrib/subversion/subversion/libsvn_repos/rev_hunt.c1747
-rw-r--r--contrib/subversion/subversion/libsvn_subr/adler32.c101
-rw-r--r--contrib/subversion/subversion/libsvn_subr/apr_escape.c135
-rw-r--r--contrib/subversion/subversion/libsvn_subr/atomic.c218
-rw-r--r--contrib/subversion/subversion/libsvn_subr/auth.c914
-rw-r--r--contrib/subversion/subversion/libsvn_subr/auth.h173
-rw-r--r--contrib/subversion/subversion/libsvn_subr/base64.c573
-rw-r--r--contrib/subversion/subversion/libsvn_subr/bit_array.c194
-rw-r--r--contrib/subversion/subversion/libsvn_subr/cache-inprocess.c692
-rw-r--r--contrib/subversion/subversion/libsvn_subr/cache-membuffer.c3480
-rw-r--r--contrib/subversion/subversion/libsvn_subr/cache-memcache.c596
-rw-r--r--contrib/subversion/subversion/libsvn_subr/cache-null.c157
-rw-r--r--contrib/subversion/subversion/libsvn_subr/cache.c319
-rw-r--r--contrib/subversion/subversion/libsvn_subr/cache.h119
-rw-r--r--contrib/subversion/subversion/libsvn_subr/cache_config.c181
-rw-r--r--contrib/subversion/subversion/libsvn_subr/checksum.c856
-rw-r--r--contrib/subversion/subversion/libsvn_subr/checksum.h74
-rw-r--r--contrib/subversion/subversion/libsvn_subr/cmdline.c1890
-rw-r--r--contrib/subversion/subversion/libsvn_subr/compat.c169
-rw-r--r--contrib/subversion/subversion/libsvn_subr/compress_lz4.c144
-rw-r--r--contrib/subversion/subversion/libsvn_subr/compress_zlib.c201
-rw-r--r--contrib/subversion/subversion/libsvn_subr/config.c1371
-rw-r--r--contrib/subversion/subversion/libsvn_subr/config_auth.c272
-rw-r--r--contrib/subversion/subversion/libsvn_subr/config_file.c1630
-rw-r--r--contrib/subversion/subversion/libsvn_subr/config_impl.h165
-rw-r--r--contrib/subversion/subversion/libsvn_subr/config_keys.inc77
-rw-r--r--contrib/subversion/subversion/libsvn_subr/config_win.c283
-rw-r--r--contrib/subversion/subversion/libsvn_subr/crypto.c705
-rw-r--r--contrib/subversion/subversion/libsvn_subr/crypto.h141
-rw-r--r--contrib/subversion/subversion/libsvn_subr/ctype.c336
-rw-r--r--contrib/subversion/subversion/libsvn_subr/date.c393
-rw-r--r--contrib/subversion/subversion/libsvn_subr/debug.c155
-rw-r--r--contrib/subversion/subversion/libsvn_subr/deprecated.c2015
-rw-r--r--contrib/subversion/subversion/libsvn_subr/dirent_uri.c2854
-rw-r--r--contrib/subversion/subversion/libsvn_subr/dirent_uri.h40
-rw-r--r--contrib/subversion/subversion/libsvn_subr/dso.c133
-rw-r--r--contrib/subversion/subversion/libsvn_subr/encode.c107
-rw-r--r--contrib/subversion/subversion/libsvn_subr/eol.c95
-rw-r--r--contrib/subversion/subversion/libsvn_subr/error.c935
-rw-r--r--contrib/subversion/subversion/libsvn_subr/errorcode.inc152
-rw-r--r--contrib/subversion/subversion/libsvn_subr/fnv1a.c263
-rw-r--r--contrib/subversion/subversion/libsvn_subr/fnv1a.h101
-rwxr-xr-xcontrib/subversion/subversion/libsvn_subr/genctype.py114
-rw-r--r--contrib/subversion/subversion/libsvn_subr/gpg_agent.c738
-rw-r--r--contrib/subversion/subversion/libsvn_subr/hash.c668
-rw-r--r--contrib/subversion/subversion/libsvn_subr/internal_statements.h76
-rw-r--r--contrib/subversion/subversion/libsvn_subr/internal_statements.sql47
-rw-r--r--contrib/subversion/subversion/libsvn_subr/io.c5741
-rw-r--r--contrib/subversion/subversion/libsvn_subr/iter.c171
-rw-r--r--contrib/subversion/subversion/libsvn_subr/libsvn_subr.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_subr/lock.c60
-rw-r--r--contrib/subversion/subversion/libsvn_subr/log.c429
-rw-r--r--contrib/subversion/subversion/libsvn_subr/lz4/LICENSE24
-rw-r--r--contrib/subversion/subversion/libsvn_subr/lz4/lz4.c1481
-rw-r--r--contrib/subversion/subversion/libsvn_subr/lz4/lz4internal.h466
-rw-r--r--contrib/subversion/subversion/libsvn_subr/macos_keychain.c264
-rw-r--r--contrib/subversion/subversion/libsvn_subr/magic.c181
-rw-r--r--contrib/subversion/subversion/libsvn_subr/md5.c58
-rw-r--r--contrib/subversion/subversion/libsvn_subr/mergeinfo.c2636
-rw-r--r--contrib/subversion/subversion/libsvn_subr/mutex.c117
-rw-r--r--contrib/subversion/subversion/libsvn_subr/nls.c103
-rw-r--r--contrib/subversion/subversion/libsvn_subr/object_pool.c327
-rw-r--r--contrib/subversion/subversion/libsvn_subr/opt.c1268
-rw-r--r--contrib/subversion/subversion/libsvn_subr/opt.h54
-rw-r--r--contrib/subversion/subversion/libsvn_subr/packed_data.c1106
-rw-r--r--contrib/subversion/subversion/libsvn_subr/path.c1322
-rw-r--r--contrib/subversion/subversion/libsvn_subr/pool.c162
-rw-r--r--contrib/subversion/subversion/libsvn_subr/pools.h43
-rw-r--r--contrib/subversion/subversion/libsvn_subr/prefix_string.c342
-rw-r--r--contrib/subversion/subversion/libsvn_subr/prompt.c941
-rw-r--r--contrib/subversion/subversion/libsvn_subr/properties.c507
-rw-r--r--contrib/subversion/subversion/libsvn_subr/quoprint.c309
-rw-r--r--contrib/subversion/subversion/libsvn_subr/root_pools.c110
-rw-r--r--contrib/subversion/subversion/libsvn_subr/simple_providers.c729
-rw-r--r--contrib/subversion/subversion/libsvn_subr/skel.c881
-rw-r--r--contrib/subversion/subversion/libsvn_subr/sorts.c543
-rw-r--r--contrib/subversion/subversion/libsvn_subr/spillbuf.c705
-rw-r--r--contrib/subversion/subversion/libsvn_subr/sqlite.c1602
-rw-r--r--contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c77
-rw-r--r--contrib/subversion/subversion/libsvn_subr/ssl_client_cert_providers.c208
-rw-r--r--contrib/subversion/subversion/libsvn_subr/ssl_client_cert_pw_providers.c504
-rw-r--r--contrib/subversion/subversion/libsvn_subr/ssl_server_trust_providers.c221
-rw-r--r--contrib/subversion/subversion/libsvn_subr/stream.c2446
-rw-r--r--contrib/subversion/subversion/libsvn_subr/string.c1579
-rw-r--r--contrib/subversion/subversion/libsvn_subr/subst.c2050
-rw-r--r--contrib/subversion/subversion/libsvn_subr/sysinfo.c1531
-rw-r--r--contrib/subversion/subversion/libsvn_subr/sysinfo.h80
-rw-r--r--contrib/subversion/subversion/libsvn_subr/target.c335
-rw-r--r--contrib/subversion/subversion/libsvn_subr/temp_serializer.c402
-rw-r--r--contrib/subversion/subversion/libsvn_subr/time.c279
-rw-r--r--contrib/subversion/subversion/libsvn_subr/token.c98
-rw-r--r--contrib/subversion/subversion/libsvn_subr/types.c352
-rw-r--r--contrib/subversion/subversion/libsvn_subr/user.c101
-rw-r--r--contrib/subversion/subversion/libsvn_subr/username_providers.c301
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf.c1263
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf8proc.c602
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf8proc/LICENSE.md93
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf8proc/NEWS.md303
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf8proc/README.md69
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf8proc/lump.md27
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc.c756
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c14391
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_internal.h708
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf_validate.c414
-rw-r--r--contrib/subversion/subversion/libsvn_subr/utf_width.c283
-rw-r--r--contrib/subversion/subversion/libsvn_subr/validate.c102
-rw-r--r--contrib/subversion/subversion/libsvn_subr/version.c305
-rw-r--r--contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c802
-rw-r--r--contrib/subversion/subversion/libsvn_subr/win32_crashrpt.h35
-rw-r--r--contrib/subversion/subversion/libsvn_subr/win32_crashrpt_dll.h90
-rw-r--r--contrib/subversion/subversion/libsvn_subr/win32_crypto.c535
-rw-r--r--contrib/subversion/subversion/libsvn_subr/win32_xlate.c258
-rw-r--r--contrib/subversion/subversion/libsvn_subr/win32_xlate.h54
-rw-r--r--contrib/subversion/subversion/libsvn_subr/x509.h134
-rw-r--r--contrib/subversion/subversion/libsvn_subr/x509info.c331
-rw-r--r--contrib/subversion/subversion/libsvn_subr/x509parse.c1231
-rw-r--r--contrib/subversion/subversion/libsvn_subr/xml.c751
-rw-r--r--contrib/subversion/subversion/libsvn_wc/README210
-rw-r--r--contrib/subversion/subversion/libsvn_wc/adm_crawler.c1305
-rw-r--r--contrib/subversion/subversion/libsvn_wc/adm_files.c555
-rw-r--r--contrib/subversion/subversion/libsvn_wc/adm_files.h137
-rw-r--r--contrib/subversion/subversion/libsvn_wc/adm_ops.c1105
-rw-r--r--contrib/subversion/subversion/libsvn_wc/ambient_depth_filter_editor.c715
-rw-r--r--contrib/subversion/subversion/libsvn_wc/cleanup.c210
-rw-r--r--contrib/subversion/subversion/libsvn_wc/conflicts.c3975
-rw-r--r--contrib/subversion/subversion/libsvn_wc/conflicts.h457
-rw-r--r--contrib/subversion/subversion/libsvn_wc/context.c116
-rw-r--r--contrib/subversion/subversion/libsvn_wc/copy.c1159
-rw-r--r--contrib/subversion/subversion/libsvn_wc/crop.c377
-rw-r--r--contrib/subversion/subversion/libsvn_wc/delete.c506
-rw-r--r--contrib/subversion/subversion/libsvn_wc/deprecated.c4874
-rw-r--r--contrib/subversion/subversion/libsvn_wc/diff.h167
-rw-r--r--contrib/subversion/subversion/libsvn_wc/diff_editor.c3213
-rw-r--r--contrib/subversion/subversion/libsvn_wc/diff_local.c587
-rw-r--r--contrib/subversion/subversion/libsvn_wc/entries.c2859
-rw-r--r--contrib/subversion/subversion/libsvn_wc/entries.h164
-rw-r--r--contrib/subversion/subversion/libsvn_wc/externals.c1765
-rw-r--r--contrib/subversion/subversion/libsvn_wc/info.c555
-rw-r--r--contrib/subversion/subversion/libsvn_wc/libsvn_wc.pc.in12
-rw-r--r--contrib/subversion/subversion/libsvn_wc/lock.c1656
-rw-r--r--contrib/subversion/subversion/libsvn_wc/lock.h91
-rw-r--r--contrib/subversion/subversion/libsvn_wc/merge.c1428
-rw-r--r--contrib/subversion/subversion/libsvn_wc/node.c1156
-rw-r--r--contrib/subversion/subversion/libsvn_wc/old-and-busted.c1345
-rw-r--r--contrib/subversion/subversion/libsvn_wc/props.c2450
-rw-r--r--contrib/subversion/subversion/libsvn_wc/props.h160
-rw-r--r--contrib/subversion/subversion/libsvn_wc/questions.c746
-rw-r--r--contrib/subversion/subversion/libsvn_wc/relocate.c170
-rw-r--r--contrib/subversion/subversion/libsvn_wc/revert.c1029
-rw-r--r--contrib/subversion/subversion/libsvn_wc/revision_status.c73
-rw-r--r--contrib/subversion/subversion/libsvn_wc/status.c2991
-rw-r--r--contrib/subversion/subversion/libsvn_wc/token-map.h81
-rw-r--r--contrib/subversion/subversion/libsvn_wc/translate.c459
-rw-r--r--contrib/subversion/subversion/libsvn_wc/translate.h189
-rw-r--r--contrib/subversion/subversion/libsvn_wc/tree_conflicts.c516
-rw-r--r--contrib/subversion/subversion/libsvn_wc/tree_conflicts.h93
-rw-r--r--contrib/subversion/subversion/libsvn_wc/update_editor.c5639
-rw-r--r--contrib/subversion/subversion/libsvn_wc/upgrade.c2090
-rw-r--r--contrib/subversion/subversion/libsvn_wc/util.c512
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc-checks.h230
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc-checks.sql291
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc-metadata.h298
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc-metadata.sql784
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc-queries.h3200
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc-queries.sql1815
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc.h743
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc_db.c16709
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc_db.h3570
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc_db_pristine.c953
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc_db_private.h542
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c4456
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc_db_util.c154
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c1019
-rw-r--r--contrib/subversion/subversion/libsvn_wc/wcroot_anchor.c249
-rw-r--r--contrib/subversion/subversion/libsvn_wc/workqueue.c1641
-rw-r--r--contrib/subversion/subversion/libsvn_wc/workqueue.h229
-rw-r--r--contrib/subversion/subversion/svn/add-cmd.c113
-rw-r--r--contrib/subversion/subversion/svn/auth-cmd.c488
-rw-r--r--contrib/subversion/subversion/svn/blame-cmd.c428
-rw-r--r--contrib/subversion/subversion/svn/cat-cmd.c119
-rw-r--r--contrib/subversion/subversion/svn/changelist-cmd.c131
-rw-r--r--contrib/subversion/subversion/svn/checkout-cmd.c185
-rw-r--r--contrib/subversion/subversion/svn/cl-conflicts.c598
-rw-r--r--contrib/subversion/subversion/svn/cl-conflicts.h91
-rw-r--r--contrib/subversion/subversion/svn/cl-log.h110
-rw-r--r--contrib/subversion/subversion/svn/cl.h1066
-rw-r--r--contrib/subversion/subversion/svn/cleanup-cmd.c135
-rw-r--r--contrib/subversion/subversion/svn/commit-cmd.c188
-rw-r--r--contrib/subversion/subversion/svn/conflict-callbacks.c2295
-rw-r--r--contrib/subversion/subversion/svn/copy-cmd.c186
-rw-r--r--contrib/subversion/subversion/svn/delete-cmd.c95
-rw-r--r--contrib/subversion/subversion/svn/deprecated.c41
-rw-r--r--contrib/subversion/subversion/svn/diff-cmd.c579
-rw-r--r--contrib/subversion/subversion/svn/export-cmd.c136
-rw-r--r--contrib/subversion/subversion/svn/file-merge.c986
-rw-r--r--contrib/subversion/subversion/svn/filesize.c240
-rw-r--r--contrib/subversion/subversion/svn/help-cmd.c194
-rw-r--r--contrib/subversion/subversion/svn/import-cmd.c132
-rw-r--r--contrib/subversion/subversion/svn/info-cmd.c1408
-rw-r--r--contrib/subversion/subversion/svn/list-cmd.c522
-rw-r--r--contrib/subversion/subversion/svn/lock-cmd.c147
-rw-r--r--contrib/subversion/subversion/svn/log-cmd.c900
-rw-r--r--contrib/subversion/subversion/svn/merge-cmd.c586
-rw-r--r--contrib/subversion/subversion/svn/mergeinfo-cmd.c461
-rw-r--r--contrib/subversion/subversion/svn/mkdir-cmd.c104
-rw-r--r--contrib/subversion/subversion/svn/move-cmd.c105
-rw-r--r--contrib/subversion/subversion/svn/notify.c1301
-rw-r--r--contrib/subversion/subversion/svn/patch-cmd.c98
-rw-r--r--contrib/subversion/subversion/svn/propdel-cmd.c103
-rw-r--r--contrib/subversion/subversion/svn/propedit-cmd.c356
-rw-r--r--contrib/subversion/subversion/svn/propget-cmd.c523
-rw-r--r--contrib/subversion/subversion/svn/proplist-cmd.c336
-rw-r--r--contrib/subversion/subversion/svn/props.c295
-rw-r--r--contrib/subversion/subversion/svn/propset-cmd.c191
-rw-r--r--contrib/subversion/subversion/svn/relocate-cmd.c120
-rw-r--r--contrib/subversion/subversion/svn/resolve-cmd.c212
-rw-r--r--contrib/subversion/subversion/svn/resolved-cmd.c88
-rw-r--r--contrib/subversion/subversion/svn/revert-cmd.c85
-rw-r--r--contrib/subversion/subversion/svn/schema/blame.rnc42
-rw-r--r--contrib/subversion/subversion/svn/schema/common.rnc77
-rw-r--r--contrib/subversion/subversion/svn/schema/diff.rnc39
-rw-r--r--contrib/subversion/subversion/svn/schema/info.rnc134
-rw-r--r--contrib/subversion/subversion/svn/schema/list.rnc45
-rw-r--r--contrib/subversion/subversion/svn/schema/log.rnc55
-rw-r--r--contrib/subversion/subversion/svn/schema/props.rnc36
-rw-r--r--contrib/subversion/subversion/svn/schema/status.rnc92
-rw-r--r--contrib/subversion/subversion/svn/shelf-cmd.c1405
-rw-r--r--contrib/subversion/subversion/svn/shelf-cmd.h49
-rw-r--r--contrib/subversion/subversion/svn/shelf2-cmd.c1369
-rw-r--r--contrib/subversion/subversion/svn/shelf2-cmd.h49
-rw-r--r--contrib/subversion/subversion/svn/similarity.c126
-rw-r--r--contrib/subversion/subversion/svn/status-cmd.c436
-rw-r--r--contrib/subversion/subversion/svn/status.c627
-rw-r--r--contrib/subversion/subversion/svn/svn.147
-rw-r--r--contrib/subversion/subversion/svn/svn.c3342
-rw-r--r--contrib/subversion/subversion/svn/switch-cmd.c209
-rw-r--r--contrib/subversion/subversion/svn/unlock-cmd.c104
-rw-r--r--contrib/subversion/subversion/svn/update-cmd.c207
-rw-r--r--contrib/subversion/subversion/svn/upgrade-cmd.c78
-rw-r--r--contrib/subversion/subversion/svn/util.c1202
-rw-r--r--contrib/subversion/subversion/svn_private_config.h.in316
-rw-r--r--contrib/subversion/subversion/svn_private_config.hw139
-rw-r--r--contrib/subversion/subversion/svnadmin/svnadmin.147
-rw-r--r--contrib/subversion/subversion/svnadmin/svnadmin.c3476
-rw-r--r--contrib/subversion/subversion/svnbench/cl.h203
-rw-r--r--contrib/subversion/subversion/svnbench/help-cmd.c90
-rw-r--r--contrib/subversion/subversion/svnbench/notify.c1045
-rw-r--r--contrib/subversion/subversion/svnbench/null-blame-cmd.c276
-rw-r--r--contrib/subversion/subversion/svnbench/null-export-cmd.c364
-rw-r--r--contrib/subversion/subversion/svnbench/null-info-cmd.c287
-rw-r--r--contrib/subversion/subversion/svnbench/null-list-cmd.c196
-rw-r--r--contrib/subversion/subversion/svnbench/null-log-cmd.c247
-rw-r--r--contrib/subversion/subversion/svnbench/svnbench.c1074
-rw-r--r--contrib/subversion/subversion/svnbench/util.c92
-rw-r--r--contrib/subversion/subversion/svndumpfilter/svndumpfilter.147
-rw-r--r--contrib/subversion/subversion/svndumpfilter/svndumpfilter.c1596
-rw-r--r--contrib/subversion/subversion/svnfsfs/dump-index-cmd.c109
-rw-r--r--contrib/subversion/subversion/svnfsfs/load-index-cmd.c197
-rw-r--r--contrib/subversion/subversion/svnfsfs/stats-cmd.c516
-rw-r--r--contrib/subversion/subversion/svnfsfs/svnfsfs.c508
-rw-r--r--contrib/subversion/subversion/svnfsfs/svnfsfs.h72
-rw-r--r--contrib/subversion/subversion/svnlook/svnlook.147
-rw-r--r--contrib/subversion/subversion/svnlook/svnlook.c2884
-rw-r--r--contrib/subversion/subversion/svnmucc/svnmucc.147
-rw-r--r--contrib/subversion/subversion/svnmucc/svnmucc.c1010
-rw-r--r--contrib/subversion/subversion/svnrdump/dump_editor.c190
-rw-r--r--contrib/subversion/subversion/svnrdump/load_editor.c1449
-rw-r--r--contrib/subversion/subversion/svnrdump/svnrdump.147
-rw-r--r--contrib/subversion/subversion/svnrdump/svnrdump.c1190
-rw-r--r--contrib/subversion/subversion/svnrdump/svnrdump.h122
-rw-r--r--contrib/subversion/subversion/svnrdump/util.c55
-rw-r--r--contrib/subversion/subversion/svnserve/cyrus_auth.c388
-rw-r--r--contrib/subversion/subversion/svnserve/log-escape.c143
-rw-r--r--contrib/subversion/subversion/svnserve/logger.c182
-rw-r--r--contrib/subversion/subversion/svnserve/logger.h86
-rw-r--r--contrib/subversion/subversion/svnserve/serve.c4540
-rw-r--r--contrib/subversion/subversion/svnserve/server.h244
-rw-r--r--contrib/subversion/subversion/svnserve/svnserve.8138
-rw-r--r--contrib/subversion/subversion/svnserve/svnserve.c1434
-rw-r--r--contrib/subversion/subversion/svnserve/svnserve.conf.5100
-rw-r--r--contrib/subversion/subversion/svnserve/winservice.c490
-rw-r--r--contrib/subversion/subversion/svnserve/winservice.h64
-rw-r--r--contrib/subversion/subversion/svnsync/svnsync.147
-rw-r--r--contrib/subversion/subversion/svnsync/svnsync.c2437
-rw-r--r--contrib/subversion/subversion/svnsync/sync.c758
-rw-r--r--contrib/subversion/subversion/svnsync/sync.h85
-rw-r--r--contrib/subversion/subversion/svnversion/svnversion.147
-rw-r--r--contrib/subversion/subversion/svnversion/svnversion.c321
-rw-r--r--contrib/subversion/win-tests.py1367
-rw-r--r--share/mk/src.opts.mk8
-rw-r--r--targets/pseudo/userland/Makefile.depend11
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc29
-rw-r--r--tools/build/options/WITHOUT_SVNLITE4
-rw-r--r--tools/build/options/WITH_SVN5
-rw-r--r--tools/build/options/WITH_SVNLITE3
-rw-r--r--usr.bin/Makefile2
-rw-r--r--usr.bin/svn/Makefile18
-rw-r--r--usr.bin/svn/Makefile.inc63
-rw-r--r--usr.bin/svn/expat.h4
-rw-r--r--usr.bin/svn/lib/Makefile22
-rw-r--r--usr.bin/svn/lib/Makefile.inc17
-rw-r--r--usr.bin/svn/lib/libapr/Makefile118
-rw-r--r--usr.bin/svn/lib/libapr/Makefile.depend15
-rw-r--r--usr.bin/svn/lib/libapr/apr.h679
-rw-r--r--usr.bin/svn/lib/libapr/apr_escape_test_char.h27
-rw-r--r--usr.bin/svn/lib/libapr/apr_private.h1084
-rw-r--r--usr.bin/svn/lib/libapr_util/Makefile73
-rw-r--r--usr.bin/svn/lib/libapr_util/Makefile.depend14
-rw-r--r--usr.bin/svn/lib/libapr_util/apr_ldap.h198
-rw-r--r--usr.bin/svn/lib/libapr_util/apu.h131
-rw-r--r--usr.bin/svn/lib/libapr_util/apu_config.h183
-rw-r--r--usr.bin/svn/lib/libapr_util/apu_select_dbm.h30
-rw-r--r--usr.bin/svn/lib/libapr_util/apu_want.h53
-rw-r--r--usr.bin/svn/lib/libapr_util/expat.h3
-rw-r--r--usr.bin/svn/lib/libserf/Makefile49
-rw-r--r--usr.bin/svn/lib/libserf/Makefile.depend16
-rw-r--r--usr.bin/svn/lib/libsvn_client/Makefile70
-rw-r--r--usr.bin/svn/lib/libsvn_client/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_delta/Makefile40
-rw-r--r--usr.bin/svn/lib/libsvn_delta/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_diff/Makefile33
-rw-r--r--usr.bin/svn/lib/libsvn_diff/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_fs/Makefile25
-rw-r--r--usr.bin/svn/lib/libsvn_fs/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_fs_fs/Makefile44
-rw-r--r--usr.bin/svn/lib/libsvn_fs_fs/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_fs_util/Makefile22
-rw-r--r--usr.bin/svn/lib/libsvn_fs_util/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_fs_x/Makefile48
-rw-r--r--usr.bin/svn/lib/libsvn_fs_x/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_ra/Makefile27
-rw-r--r--usr.bin/svn/lib/libsvn_ra/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_ra_local/Makefile23
-rw-r--r--usr.bin/svn/lib/libsvn_ra_local/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_ra_serf/Makefile52
-rw-r--r--usr.bin/svn/lib/libsvn_ra_serf/Makefile.depend14
-rw-r--r--usr.bin/svn/lib/libsvn_ra_svn/Makefile31
-rw-r--r--usr.bin/svn/lib/libsvn_ra_svn/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_repos/Makefile44
-rw-r--r--usr.bin/svn/lib/libsvn_repos/Makefile.depend13
-rw-r--r--usr.bin/svn/lib/libsvn_subr/Makefile109
-rw-r--r--usr.bin/svn/lib/libsvn_subr/Makefile.depend17
-rw-r--r--usr.bin/svn/lib/libsvn_wc/Makefile59
-rw-r--r--usr.bin/svn/lib/libsvn_wc/Makefile.depend13
-rw-r--r--usr.bin/svn/svn/Makefile127
-rw-r--r--usr.bin/svn/svn/Makefile.depend41
-rw-r--r--usr.bin/svn/svn_private_config.h319
-rw-r--r--usr.bin/svn/svnadmin/Makefile47
-rw-r--r--usr.bin/svn/svnadmin/Makefile.depend30
-rw-r--r--usr.bin/svn/svnbench/Makefile74
-rw-r--r--usr.bin/svn/svnbench/Makefile.depend41
-rw-r--r--usr.bin/svn/svndumpfilter/Makefile48
-rw-r--r--usr.bin/svn/svndumpfilter/Makefile.depend31
-rw-r--r--usr.bin/svn/svnfsfs/Makefile50
-rw-r--r--usr.bin/svn/svnfsfs/Makefile.depend31
-rw-r--r--usr.bin/svn/svnlook/Makefile49
-rw-r--r--usr.bin/svn/svnlook/Makefile.depend31
-rw-r--r--usr.bin/svn/svnmucc/Makefile63
-rw-r--r--usr.bin/svn/svnmucc/Makefile.depend40
-rw-r--r--usr.bin/svn/svnrdump/Makefile68
-rw-r--r--usr.bin/svn/svnrdump/Makefile.depend40
-rw-r--r--usr.bin/svn/svnserve/Makefile62
-rw-r--r--usr.bin/svn/svnserve/Makefile.depend35
-rw-r--r--usr.bin/svn/svnsync/Makefile60
-rw-r--r--usr.bin/svn/svnsync/Makefile.depend37
-rw-r--r--usr.bin/svn/svnversion/Makefile43
-rw-r--r--usr.bin/svn/svnversion/Makefile.depend27
1273 files changed, 25 insertions, 828187 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index b06c269b6489..067516c9288e 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2739,7 +2739,6 @@ NXBMAKEARGS+= \
MK_PROFILE=no \
MK_RETPOLINE=no \
MK_SENDMAIL=no \
- MK_SVNLITE=no \
MK_TESTS=no \
MK_WERROR=no \
MK_ZFS=no
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index f61441307a06..df713cfd1fb0 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -40,6 +40,31 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20210611: Remove svn and svnlite
+OLD_FILES+=usr/bin/svn
+OLD_FILES+=usr/bin/svnadmin
+OLD_FILES+=usr/bin/svnbench
+OLD_FILES+=usr/bin/svndumpfilter
+OLD_FILES+=usr/bin/svnfsfs
+OLD_FILES+=usr/bin/svnlite
+OLD_FILES+=usr/bin/svnliteadmin
+OLD_FILES+=usr/bin/svnlitebench
+OLD_FILES+=usr/bin/svnlitedumpfilter
+OLD_FILES+=usr/bin/svnlitefsfs
+OLD_FILES+=usr/bin/svnlitelook
+OLD_FILES+=usr/bin/svnlitemucc
+OLD_FILES+=usr/bin/svnliterdump
+OLD_FILES+=usr/bin/svnliteserve
+OLD_FILES+=usr/bin/svnlitesync
+OLD_FILES+=usr/bin/svnliteversion
+OLD_FILES+=usr/bin/svnlook
+OLD_FILES+=usr/bin/svnmucc
+OLD_FILES+=usr/bin/svnrdump
+OLD_FILES+=usr/bin/svnserve
+OLD_FILES+=usr/bin/svnsync
+OLD_FILES+=usr/bin/svnversion
+OLD_FILES+=usr/share/man/man1/svnlite.1.gz
+
# 20210607: remove ancontrol(8) related programs
OLD_FILES+=usr/sbin/ancontrol
OLD_FILES+=usr/share/man/man8/ancontrol.8.gz
diff --git a/contrib/apr-util/CHANGES b/contrib/apr-util/CHANGES
deleted file mode 100644
index 1b2333bed223..000000000000
--- a/contrib/apr-util/CHANGES
+++ /dev/null
@@ -1,83 +0,0 @@
- -*- coding: utf-8 -*-
-Changes with APR-util 1.6.1
-
- *) Win32: Add function exports from new apr_crypto API's missing in 1.6.0.
-
- *) Win32: Introduce XML_PARSER build-time variable to select the expat
- library name to be linked to libaprutil-1.dll. See Makefile.win
-
- *) Win32: Removed lingering xml/xml.dsp project forked from the expat
- Project in the 1.9x era. Use expat's maintained build schema instead,
- prior to building apr-util.
-
- *) apr_crypto: Fix compatibility with LibreSSL. PR 61596.
- [Bernard Spil <brnrd freebsd.org>, Yann Ylavic]
-
- *) sdbm: better database/page validation to fail cleanly when corrupted.
- [Yann Ylavic]
-
-Changes with APR-util 1.6.0
-
- *) The expat dependency of apr-util is no longer built with apr-util.
- Install expat (including development headers and libraries) first
- before building apr-util. [https://libexpat.github.io/]
-
- *) Mark apr_dbd_freetds as unsupported, and remove it from all builds
- [Nick Kew]
-
- *) Update MySQL build to stop using libmysqlclient_r.
- [Petr Sumbera <petr.sumbera oracle.com>]
-
- *) apr_buckets: Add apr_bucket_file_set_buf_size() which allows to configure
- the size of the buffer used to read files. [Yann Ylavic]
-
- *) apr_crypto: avoid excessive iteration in bcrypt hash.
- [Hanno Böck <hanno hboeck.de>]
-
- *) apr_siphash: Implement keyed hash function SipHash. [Yann Ylavic]
-
- *) apr_crypto: Add apr_crypto_key() function which supports keys
- generated from a passphrase or a raw secret provided by the caller.
- Deprecate apr_crypto_passphrase(). [Graham Leggett]
-
- *) apr_crypto_nss: Ensure the SECItem returned by PK11_ParamFromIV
- is properly freed. [Graham Leggett]
-
- *) apr_crypto: Don't cache the driver if initialisation fails. This
- stops the second and subsequent attempt to use the API from failing
- claiming the library is not initialised. [Graham Leggett]
-
- *) apr_crypto: Add a native CommonCrypto implementation for iOS and OSX
- where OpenSSL has been deprecated. [Graham Leggett]
-
- *) apr_xml_to_text: Add style APR_XML_X2T_PARSED to maintain a
- consistent namespace prefix. [Jari Urpalainen
- <jari.urpalainen nokia.com>]
-
-Changes with APR-util 1.5.x and later:
-
- *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?view=markup
-
-Changes with APR-util 1.4.x and later:
-
- *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?view=markup
-
-Changes for APR-util 1.3.x and later:
-
- *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?view=markup
-
-Changes for APR-util 1.2.x and later:
-
- *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/CHANGES?view=markup
-
-Changes for APR-util 1.1.x and later:
-
- *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.1.x/CHANGES?view=markup
-
-Changes for APR-util 1.0.x and later:
-
- *) http://svn.apache.org/viewvc/apr/apr-util/branches/1.0.x/CHANGES?view=markup
-
-Changes for APR-util 0.9.x and later/earlier:
-
- *) http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/CHANGES?view=markup
diff --git a/contrib/apr-util/CMakeLists.txt b/contrib/apr-util/CMakeLists.txt
deleted file mode 100644
index 9ae90b19f97e..000000000000
--- a/contrib/apr-util/CMakeLists.txt
+++ /dev/null
@@ -1,355 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT 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-Util C)
-
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
-FIND_PACKAGE(OpenSSL)
-
-FIND_PACKAGE(expat)
-
-OPTION(APU_HAVE_CRYPTO "Crypto support" OFF)
-OPTION(APU_HAVE_ODBC "Build ODBC DBD driver" ON)
-OPTION(APR_HAS_LDAP "LDAP 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(APR_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with APR include files")
-SET(APR_LIBRARIES "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib" CACHE STRING "APR library to link with")
-
-IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
- MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
-ENDIF()
-FOREACH(onelib ${APR_LIBRARIES})
- IF(NOT EXISTS ${onelib})
- MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")
- ENDIF()
-ENDFOREACH()
-
-IF(APU_HAVE_CRYPTO)
-IF(NOT OPENSSL_FOUND)
- MESSAGE(FATAL_ERROR "OpenSSL is the only supported crypto implementation, and it wasn't found!")
-ENDIF()
-ENDIF()
-
-# create 1-or-0 representation of feature tests for apu.h
-
-SET(apu_have_crypto_10 0)
-SET(apu_have_apr_iconv_10 0) # not yet implemented
-SET(apr_has_ldap_10 0)
-
-IF(APU_HAVE_CRYPTO)
- SET(apu_have_crypto_10 1)
-ENDIF()
-
-IF(APR_HAS_LDAP)
- SET(apr_has_ldap_10 1)
-ENDIF()
-
-IF(NOT EXPAT_FOUND)
- MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!")
-ENDIF()
-
-SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS})
-SET(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES})
-
-SET(LDAP_LIBRARIES)
-IF(APR_HAS_LDAP)
- SET(LDAP_LIBRARIES wldap32)
-ENDIF()
-
-CONFIGURE_FILE(include/apu.hwc
- ${PROJECT_BINARY_DIR}/apu.h)
-CONFIGURE_FILE(include/apr_ldap.hwc
- ${PROJECT_BINARY_DIR}/apr_ldap.h)
-# "COPYONLY" just because anything else isn't implemented ;)
-CONFIGURE_FILE(include/private/apu_config.hw
- ${PROJECT_BINARY_DIR}/apu_config.h
- COPYONLY)
-CONFIGURE_FILE(include/private/apu_select_dbm.hw
- ${PROJECT_BINARY_DIR}/apu_select_dbm.h
- COPYONLY)
-CONFIGURE_FILE(include/apu_want.hw
- ${PROJECT_BINARY_DIR}/apu_want.h
- COPYONLY)
-
-# 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 apu.h in PROJECT_SOURCE_DIR/include if
-# you've generated apu.h before using a different build
-
-SET(APR_INCLUDE_DIRECTORIES
- ${PROJECT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/include
- ${CMAKE_CURRENT_SOURCE_DIR}/include/private
- ${APR_INCLUDE_DIR}
-)
-
-INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR})
-
-SET(APR_PUBLIC_HEADERS_STATIC
- include/apr_anylock.h
- include/apr_base64.h
- include/apr_buckets.h
- include/apr_crypto.h
- include/apr_date.h
- include/apr_dbd.h
- include/apr_dbm.h
- include/apr_hooks.h
- include/apr_ldap_init.h
- include/apr_ldap_option.h
- include/apr_ldap_rebind.h
- include/apr_ldap_url.h
- include/apr_md4.h
- include/apr_md5.h
- include/apr_memcache.h
- include/apr_optional.h
- include/apr_optional_hooks.h
- include/apr_queue.h
- include/apr_redis.h
- include/apr_reslist.h
- include/apr_rmm.h
- include/apr_sdbm.h
- include/apr_sha1.h
- include/apr_siphash.h
- include/apr_strmatch.h
- include/apr_thread_pool.h
- include/apr_uri.h
- include/apr_uuid.h
- include/apr_xlate.h
- include/apr_xml.h
- include/apu_errno.h
- include/apu_version.h
-)
-
-# apu_config.h and apu_select_dbm.h are private
-SET(APR_PUBLIC_HEADERS_GENERATED
- ${PROJECT_BINARY_DIR}/apu.h
- ${PROJECT_BINARY_DIR}/apr_ldap.h
- ${PROJECT_BINARY_DIR}/apu_want.h
-)
-
-SET(APR_SOURCES
- buckets/apr_brigade.c
- buckets/apr_buckets.c
- buckets/apr_buckets_alloc.c
- buckets/apr_buckets_eos.c
- buckets/apr_buckets_file.c
- buckets/apr_buckets_flush.c
- buckets/apr_buckets_heap.c
- buckets/apr_buckets_mmap.c
- buckets/apr_buckets_pipe.c
- buckets/apr_buckets_pool.c
- buckets/apr_buckets_refcount.c
- buckets/apr_buckets_simple.c
- buckets/apr_buckets_socket.c
- crypto/apr_crypto.c
- crypto/apr_md4.c
- crypto/apr_md5.c
- crypto/apr_passwd.c
- crypto/apr_sha1.c
- crypto/apr_siphash.c
- crypto/crypt_blowfish.c
- crypto/getuuid.c
- crypto/uuid.c
- dbd/apr_dbd.c
- dbm/apr_dbm.c
- dbm/apr_dbm_sdbm.c
- dbm/sdbm/sdbm.c
- dbm/sdbm/sdbm_hash.c
- dbm/sdbm/sdbm_lock.c
- dbm/sdbm/sdbm_pair.c
- encoding/apr_base64.c
- hooks/apr_hooks.c
- memcache/apr_memcache.c
- misc/apr_date.c
- misc/apr_queue.c
- misc/apr_reslist.c
- misc/apr_rmm.c
- misc/apr_thread_pool.c
- misc/apu_dso.c
- misc/apu_version.c
- redis/apr_redis.c
- strmatch/apr_strmatch.c
- uri/apr_uri.c
- xlate/xlate.c
- xml/apr_xml.c
-)
-
-IF(APR_HAS_LDAP)
- SET(APR_SOURCES ${APR_SOURCES} ldap/apr_ldap_stub.c ldap/apr_ldap_url.c)
-ENDIF()
-
-SET(APR_TEST_SOURCES
- test/abts.c
- test/testbuckets.c
- test/testcrypto.c
- test/testdate.c
- test/testdbd.c
- test/testdbm.c
- test/testldap.c
- test/testmd4.c
- test/testmd5.c
- test/testmemcache.c
- test/testpass.c
- test/testqueue.c
- test/testredis.c
- test/testreslist.c
- test/testrmm.c
- test/testsiphash.c
- test/teststrmatch.c
- test/testuri.c
- test/testutil.c
- test/testuuid.c
- test/testxlate.c
- test/testxml.c
-)
-
-SET(install_targets)
-SET(install_bin_pdb)
-SET(dbd_drivers)
-
-# Note: The WINNT definition on some targets is used only by libaprutil.rc.
-
-# libaprutil-1 is shared, aprutil-1 is static
-ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc)
-SET(install_targets ${install_targets} libaprutil-1)
-SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb)
-TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
-SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;XML_STATIC;WINNT")
-
-ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
-SET(install_targets ${install_targets} aprutil-1)
-TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
-SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC")
-
-IF(APU_HAVE_CRYPTO)
- IF(NOT OPENSSL_FOUND)
- MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build")
- ENDIF()
- ADD_LIBRARY(apr_crypto_openssl-1 SHARED crypto/apr_crypto_openssl.c libaprutil.rc)
- SET(install_targets ${install_targets} apr_crypto_openssl-1)
- SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb)
- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}")
- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_crypto_openssl")
- TARGET_LINK_LIBRARIES(apr_crypto_openssl-1 libaprutil-1 ${APR_LIBRARIES} ${OPENSSL_LIBRARIES})
-ENDIF()
-
-IF(APU_HAVE_ODBC)
- ADD_LIBRARY(apr_dbd_odbc-1 SHARED dbd/apr_dbd_odbc.c libaprutil.rc)
- SET(install_targets ${install_targets} apr_dbd_odbc-1)
- SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_dbd_odbc-1.pdb)
- SET(dbd_drivers ${dbd_drivers} odbc)
- TARGET_LINK_LIBRARIES(apr_dbd_odbc-1 libaprutil-1 ${APR_LIBRARIES} odbc32 odbccp32)
- SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver)
- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT")
- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_dbd_odbc")
-ENDIF()
-
-IF(APR_HAS_LDAP)
- ADD_LIBRARY(apr_ldap-1 SHARED ldap/apr_ldap_init.c ldap/apr_ldap_option.c
- ldap/apr_ldap_rebind.c libaprutil.rc)
- SET(install_targets ${install_targets} apr_ldap-1)
- SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb)
- TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1 ${APR_LIBRARIES} ${LDAP_LIBRARIES})
- SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
- SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_ldap")
- SET(apr_ldap_libraries apr_ldap-1)
-ELSE()
- SET(apr_ldap_libraries)
-ENDIF()
-
-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/billion-laughs.xml
- ${PROJECT_BINARY_DIR}/data/billion-laughs.xml)
-
- IF(TEST_STATIC_LIBS)
- SET(whichapr aprutil-1)
- SET(apiflag "-DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC")
- ELSE()
- SET(whichapr libaprutil-1)
- SET(apiflag)
- ENDIF()
-
- ADD_EXECUTABLE(testall ${APR_TEST_SOURCES})
- TARGET_LINK_LIBRARIES(testall ${whichapr} ${apr_ldap_libraries} ${XMLLIB_LIBRARIES} ${LDAP_LIBRARIES})
- IF(apiflag)
- SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_FLAGS ${apiflag})
- ENDIF()
- ADD_TEST(NAME testall COMMAND testall)
-
- ADD_EXECUTABLE(dbd test/dbd.c)
- TARGET_LINK_LIBRARIES(dbd ${whichapr})
- IF(apiflag)
- SET_TARGET_PROPERTIES(dbd PROPERTIES COMPILE_FLAGS ${apiflag})
- ENDIF()
-
- # dbd is run multiple times with different parameters.
- FOREACH(somedbd ${dbd_drivers})
- ADD_TEST(NAME dbd-${somedbd} COMMAND dbd ${somedbd})
- ENDFOREACH()
-
-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)
-
-STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)
-MESSAGE(STATUS "")
-MESSAGE(STATUS "")
-MESSAGE(STATUS "APR-Util 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 " APR include directory ........... : ${APR_INCLUDE_DIR}")
-MESSAGE(STATUS " APR libraries ................... : ${APR_LIBRARIES}")
-MESSAGE(STATUS " DBD ODBC driver ................. : ${APU_HAVE_ODBC}")
-MESSAGE(STATUS " APU_HAVE_CRYPTO ................. : ${APU_HAVE_CRYPTO}")
-MESSAGE(STATUS " APR_HAS_LDAP .................... : ${APR_HAS_LDAP}")
-MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}")
-IF(TEST_STATIC_LIBS)
-MESSAGE(STATUS " (testing static libraries)")
-ELSE()
-MESSAGE(STATUS " (testing dynamic libraries)")
-ENDIF()
diff --git a/contrib/apr-util/LICENSE b/contrib/apr-util/LICENSE
deleted file mode 100644
index bfe78d537e43..000000000000
--- a/contrib/apr-util/LICENSE
+++ /dev/null
@@ -1,459 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-
-APACHE PORTABLE RUNTIME SUBCOMPONENTS:
-
-The Apache Portable Runtime includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-For the include\apr_md5.h component:
-/*
- * This is work is derived from material Copyright RSA Data Security, Inc.
- *
- * The RSA copyright statement and Licence for that original material is
- * included below. This is followed by the Apache copyright statement and
- * licence for the modifications made to that material.
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- rights reserved.
-
- License to copy and use this software is granted provided that it
- is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- Algorithm" in all material mentioning or referencing this software
- or this function.
-
- License is also granted to make and use derivative works provided
- that such works are identified as "derived from the RSA Data
- Security, Inc. MD5 Message-Digest Algorithm" in all material
- mentioning or referencing the derived work.
-
- RSA Data Security, Inc. makes no representations concerning either
- the merchantability of this software or the suitability of this
- software for any particular purpose. It is provided "as is"
- without express or implied warranty of any kind.
-
- These notices must be retained in any copies of any part of this
- documentation and/or software.
- */
-
-For the passwd\apr_md5.c component:
-
-/*
- * This is work is derived from material Copyright RSA Data Security, Inc.
- *
- * The RSA copyright statement and Licence for that original material is
- * included below. This is followed by the Apache copyright statement and
- * licence for the modifications made to that material.
- */
-
-/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- rights reserved.
-
- License to copy and use this software is granted provided that it
- is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- Algorithm" in all material mentioning or referencing this software
- or this function.
-
- License is also granted to make and use derivative works provided
- that such works are identified as "derived from the RSA Data
- Security, Inc. MD5 Message-Digest Algorithm" in all material
- mentioning or referencing the derived work.
-
- RSA Data Security, Inc. makes no representations concerning either
- the merchantability of this software or the suitability of this
- software for any particular purpose. It is provided "as is"
- without express or implied warranty of any kind.
-
- These notices must be retained in any copies of any part of this
- documentation and/or software.
- */
-/*
- * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0
- * MD5 crypt() function, which is licenced as follows:
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dknet.dk> wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- */
-
-For the crypto\apr_md4.c component:
-
- * This is derived from material copyright RSA Data Security, Inc.
- * Their notice is reproduced below in its entirety.
- *
- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- * rights reserved.
- *
- * License to copy and use this software is granted provided that it
- * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
- * Algorithm" in all material mentioning or referencing this software
- * or this function.
- *
- * License is also granted to make and use derivative works provided
- * that such works are identified as "derived from the RSA Data
- * Security, Inc. MD4 Message-Digest Algorithm" in all material
- * mentioning or referencing the derived work.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-For the crypto\crypt_blowfish.c(.h) component:
-
- * Written by Solar Designer <solar at openwall.com> in 1998-2011.
- * No copyright is claimed, and the software is hereby placed in the public
- * domain. In case this attempt to disclaim copyright and place the software
- * in the public domain is deemed null and void, then the software is
- * Copyright (c) 1998-2011 Solar Designer and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
-
- See crypto/crypt_blowfish.c for more information.
-
-For the include\apr_md4.h component:
-
- *
- * This is derived from material copyright RSA Data Security, Inc.
- * Their notice is reproduced below in its entirety.
- *
- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- * rights reserved.
- *
- * License to copy and use this software is granted provided that it
- * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
- * Algorithm" in all material mentioning or referencing this software
- * or this function.
- *
- * License is also granted to make and use derivative works provided
- * that such works are identified as "derived from the RSA Data
- * Security, Inc. MD4 Message-Digest Algorithm" in all material
- * mentioning or referencing the derived work.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-For the test\testmd4.c component:
-
- *
- * This is derived from material copyright RSA Data Security, Inc.
- * Their notice is reproduced below in its entirety.
- *
- * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
- * rights reserved.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-For the xml\expat\conftools\install-sh component:
-
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission. M.I.T. makes no representations about the
-# suitability of this software for any purpose. It is provided "as is"
-# without express or implied warranty.
-#
-
-For the expat xml parser component:
-
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- and Clark Cooper
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====================================================================
-
-For the ldap/apr_ldap_url.c component:
-
-/* Portions Copyright 1998-2002 The OpenLDAP Foundation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License. A copy of this license is available at
- * http://www.OpenLDAP.org/license.html or in file LICENSE in the
- * top-level directory of the distribution.
- *
- * OpenLDAP is a registered trademark of the OpenLDAP Foundation.
- *
- * Individual files and/or contributed packages may be copyright by
- * other parties and subject to additional restrictions.
- *
- * This work is derived from the University of Michigan LDAP v3.3
- * distribution. Information concerning this software is available
- * at: http://www.umich.edu/~dirsvcs/ldap/
- *
- * This work also contains materials derived from public sources.
- *
- * Additional information about OpenLDAP can be obtained at:
- * http://www.openldap.org/
- */
-
-/*
- * Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
diff --git a/contrib/apr-util/Makefile.in b/contrib/apr-util/Makefile.in
deleted file mode 100644
index 208dd1cc1e65..000000000000
--- a/contrib/apr-util/Makefile.in
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Top-level Makefile for APRUTIL
-#
-CPP = @CPP@
-
-# gets substituted into some targets
-APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@
-APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
-APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
-APRUTIL_LIBS = @APRUTIL_LIBS@
-
-TARGET_LIB = lib@APRUTIL_LIBNAME@.la
-INSTALL_SUBDIRS = @APR_ICONV_DIR@
-EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@
-APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
-APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-APU_MODULES = @APU_MODULES@
-LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
-APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
-
-LT_VERSION = @APU_LTVERSION@
-
-EXTRA_OBJECTS = @EXTRA_OBJECTS@
-
-LDADD_dbd_pgsql = @LDADD_dbd_pgsql@
-LDADD_dbd_oracle = @LDADD_dbd_oracle@
-LDADD_dbd_sqlite2 = @LDADD_dbd_sqlite2@
-LDADD_dbd_sqlite3 = @LDADD_dbd_sqlite3@
-LDADD_dbd_mysql = @LDADD_dbd_mysql@
-LDADD_dbd_odbc = @LDADD_dbd_odbc@
-LDADD_dbm_db = @LDADD_dbm_db@
-LDADD_dbm_gdbm = @LDADD_dbm_gdbm@
-LDADD_dbm_ndbm = @LDADD_dbm_ndbm@
-LDADD_ldap = @LDADD_ldap@
-LDADD_crypto_openssl = @LDADD_crypto_openssl@
-LDADD_crypto_nss = @LDADD_crypto_nss@
-LDADD_crypto_commoncrypto = @LDADD_crypto_commoncrypto@
-
-TARGETS = $(TARGET_LIB) aprutil.exp apu-config.out $(APU_MODULES)
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-@INCLUDE_OUTPUTS@
-
-CLEAN_SUBDIRS = test @APR_ICONV_DIR@
-
-CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out
-DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
- include/private/apu_config.h include/private/apu_private.h \
- include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \
- export_vars.sh $(APU_CONFIG) build/rules.mk include/apu_want.h \
- apr-util.pc build/pkg/pkginfo
-EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \
- exports.c build-outputs.mk \
- build/apr_common.m4 build/find_apr.m4 build/install.sh \
- build/config.guess build/config.sub
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-includedir=@includedir@
-top_srcdir=@abs_srcdir@
-top_blddir=@abs_builddir@
-
-# Create apu-config script suitable for the install tree
-apu-config.out: $(APU_CONFIG)
- sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
-
-install: $(TARGETS) install-modules
- $(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
- $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
- for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \
- $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
- done
- $(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
- list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
- ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
- done
- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
- $(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
- $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
-
-$(TARGET_LIB): $(OBJECTS) $(EXTRA_OBJECTS)
- $(LINK) @lib_target@ $(EXTRA_OBJECTS) $(ALL_LIBS) $(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)
-
-install-modules: install-modules-@APU_HAVE_MODULES@
-
-install-modules-no:
-
-install-modules-yes: $(APU_MODULES)
- $(APR_MKDIR) $(DESTDIR)$(APU_DSO_LIBDIR)
- @for m in $(APU_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APU_DSO_LIBDIR); done
-
-exports.c: $(HEADERS)
- $(APR_MKEXPORT) $(HEADERS) > $@
-
-export_vars.c: $(HEADERS)
- $(APR_MKVAREXPORT) $(HEADERS) > $@
-
-aprutil.exp: exports.c export_vars.c
- @echo "#! lib@APRUTIL_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
-
-test: check
-check: $(TARGET_LIB)
- cd test && $(MAKE) all check
-
-.PHONY: install-modules install-modules-yes install-modules-no dox test check
diff --git a/contrib/apr-util/Makefile.win b/contrib/apr-util/Makefile.win
deleted file mode 100644
index 454b4fecdbf1..000000000000
--- a/contrib/apr-util/Makefile.win
+++ /dev/null
@@ -1,384 +0,0 @@
-# Makefile.win for Win32 APR + APR-iconv + APR-util
-#
-# Targets are:
-#
-# buildall - compile everything
-# checkall - run APR + APR-util 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"
-#
-# Provide the APR_PATH, API_PATH and APU_PATH entirely relative
-# to one another! At this time, building the libraries themselves
-# is only expected to work if the defaults (../apr, ../apr-iconv
-# and ../apr-util) are used, or if they are built with USEMAK=1.
-#
-# APR_PATH=..\apr-1.3.0
-# API_PATH=..\apr-iconv-1.3.0
-# APU_PATH=..\apr-util-1.3.0
-#
-# Provide a DBD_LIST argument after configuring LIB and INCLUDE with
-# the SDK paths of the corresponding client support libraries.
-# ODBC is always built on Windows, so it does not get included in DBD_LIST
-# Note that at this time, none of these are supported on win32, per say.
-#
-# DBD_LIST="sqlite3 pgsql oracle mysql freetds"
-#
-# Provide a DBM_LIST argument after configuring LIB and INCLUDE with
-# the SDK paths of the corresponding database support libraries. Right
-# now only db has been configured, gdbm and ndbm require additional study.
-# Note that at this time, none of these are supported on win32, per say.
-#
-# DBM_LIST="db gdbm"
-#
-# Provide a CRYPTO_LIST argument after configuring LIB and INCLUDE with
-# the SDK paths of the corresponding cryptographic support libraries.
-#
-# CRYPTO_LIST="nss openssl"
-#
-# Provide the XML_PARSER argument after configuring LIB and INCLUDE with
-# the expat path of the corresponding xml parser, e.g. libexpatMT to choose
-# static, or libexpat (default) to choose the dynamic library for aprutil-1.dll
-# (Static libaprutil-1.lib always presumes libexpatMT with XML_STATIC flag.)
-#
-# XML_PARSER="libexpat"
-#
-# For example;
-#
-# nmake -f Makefile.win PREFIX=C:\APR buildall checkall installall clean
-#
-
-!IF EXIST("aprutil.sln") && ([devenv /help > NUL 2>&1] == 0) \
- && !defined(USEMAK) && !defined(USEDSW)
-USESLN=1
-USEMAK=0
-USEDSW=0
-!ELSEIF EXIST("aprutil.mak") && !defined(USEDSW)
-USESLN=0
-USEMAK=1
-USEDSW=0
-!ELSE
-USESLN=0
-USEMAK=0
-USEDSW=1
-!ENDIF
-
-PREFIX=..\apr-dist
-
-!IF EXIST("..\openssl")
-!IF EXIST("..\openssl\libcrypto.lib")
-SSLOPT=_HAVE_OSSL110=1
-!ENDIF
-!ENDIF
-
-# Legacy default (and unwise alternative) for libapr-1.dll is libexpatMT
-XML_PARSER="libexpat"
-!IF "$(XML_PARSER)" == "libexpat"
-XMLOPT=XML_PARSER=$(XML_PARSER)
-!ELSE
-XMLOPT=XML_PARSER=$(XML_PARSER) XML_OPTIONS="/D XML_STATIC"
-!ENDIF
-
-!IF [$(COMSPEC) /c cl /nologo /? \
- | $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
-ARCH=x64 Release
-!ELSE
-ARCH=Win32 Release
-!ENDIF
-
-APR_PATH=..\apr
-API_PATH=..\apr-iconv
-APU_PATH=..\apr-util
-
-!MESSAGE ARCH = $(ARCH)
-!MESSAGE APR_PATH = $(APR_PATH)
-!MESSAGE API_PATH = $(API_PATH) (apr-iconv)
-!MESSAGE APU_PATH = $(APU_PATH) (apr-util)
-!MESSAGE PREFIX = $(PREFIX) (install path)
-!MESSAGE DBD_LIST = $(DBD_LIST)
-!MESSAGE DBM_LIST = $(DBM_LIST)
-!MESSAGE CRYPTO_LIST = $(CRYPTO_LIST)
-
-# Utility and Translation things, nothing here for the user
-#
-!IF "$(ARCH)" == "Win32 Release"
-SLNARCH=Release|Win32
-ARCHPATH=Release
-LIBSPATH=LibR
-ARCHOSPATH=Release
-LIBSOSPATH=LibR
-!ELSEIF "$(ARCH)" == "Win32 Debug"
-SLNARCH=Debug|Win32
-ARCHPATH=Debug
-LIBSPATH=LibD
-ARCHOSPATH=Debug
-LIBSOSPATH=LibD
-!ELSEIF "$(ARCH)" == "Win32 Release9x"
-SLNARCH=Release9x|Win32
-ARCHPATH=Release
-LIBSPATH=LibR
-ARCHOSPATH=9x\Release
-LIBSOSPATH=9x\LibR
-!ELSEIF "$(ARCH)" == "Win32 Debug9x"
-SLNARCH=Debug9x|Win32
-ARCHPATH=Debug
-LIBSPATH=LibD
-ARCHOSPATH=9x\Debug
-LIBSOSPATH=9x\LibD
-!ELSEIF "$(ARCH)" == "x64 Release"
-SLNARCH=Release|x64
-ARCHPATH=x64\Release
-LIBSPATH=x64\LibR
-ARCHOSPATH=x64\Release
-LIBSOSPATH=x64\LibR
-!ELSEIF "$(ARCH)" == "x64 Debug"
-SLNARCH=Debug|x64
-ARCHPATH=x64\Debug
-LIBSPATH=x64\LibD
-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
-
-
-# Sanity Checks
-#
-!IF !EXIST("$(APR_PATH)\apr.dsp") || !EXIST("$(API_PATH)\apriconv.dsp") \
- || !EXIST("$(APU_PATH)\aprutil.dsp")
-!MESSAGE Please check out or download and unpack the Apache Portability Runtime
-!MESSAGE sources (apr, apr-iconv and apr-util) under a single parent dir,
-!MESSAGE or provide APR_PATH, API_PATH and APU_PATH (all relative to each other,
-!MESSAGE or all absolute paths).
-!MESSAGE Apache cannot build without these libraries!
-!MESSAGE
-!ERROR Need apr and apr-iconv alongside apr-util to build!
-!ENDIF
-
-
-all: buildall checkall
-
-# To help win32 pick up the locations where they don't fall in the usual
-# path locations. This may not be completely effective for USESLN/USEDSP
-# oriented builds, just yet
-#
-LIB=$(APR_PATH)\$(ARCHOSPATH);$(APR_PATH)\$(LIBSOSPATH);$(API_PATH)\$(ARCHPATH);$(API_PATH)\$(LIBSPATH);$(APU_PATH)\$(ARCHPATH);$(APU_PATH)\$(LIBSPATH);$(LIB)
-INCLUDE=$(APR_PATH)\include;$(API_PATH)\include;$(INCLUDE)
-
-!IF $(USEMAK) == 1
-
-clean:
- $(MAKE) $(MAKEOPT) -f Makefile.win ARCH="$(ARCH)" \
- CTARGET=CLEAN buildall
-
-buildall:
- cd $(APR_PATH)
- $(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 ..
- cd $(API_PATH)
- $(MAKE) $(MAKEOPT) -f apriconv.mak CFG="apriconv - $(ARCH)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f libapriconv.mak CFG="libapriconv - $(ARCH)" RECURSE=0 $(CTARGET)
-!IF "$(CTARGET)" == "CLEAN"
- $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
- BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
-!ELSE
- cd ccs
- $(MAKE) $(MAKEOPT) -f Makefile.win all \
- BUILD_MODE="$(ARCH)" BIND_MODE=shared
- cd ..\ces
- $(MAKE) $(MAKEOPT) -f Makefile.win all \
- BUILD_MODE="$(ARCH)" BIND_MODE=shared
- cd ..
-!ENDIF
- cd $(APU_PATH)
- $(MAKE) $(MAKEOPT) $(SSLOPT) $(XMLOPT) -f aprutil.mak CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) $(SSLOPT) $(XMLOPT) -f libaprutil.mak CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET)
- cd ldap
- $(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
- cd ..
- cd dbd
- for %d in (odbc $(DBD_LIST)) do \
- $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(ARCH)" RECURSE=0 $(CTARGET)
- cd ..
- cd dbm
- for %d in ($(DBM_LIST) x) do if not %d == x \
- $(MAKE) $(MAKEOPT) -f apr_dbm_%d.mak CFG="apr_dbm_%d - $(ARCH)" RECURSE=0 $(CTARGET)
- cd ..
- cd crypto
- for %d in ($(CRYPTO_LIST) x) do if not %d == x \
- $(MAKE) $(MAKEOPT) $(SSLOPT) -f apr_crypto_%d.mak CFG="apr_crypto_%d - $(ARCH)" RECURSE=0 $(CTARGET)
- cd ..
-
-!ELSEIF $(USESLN) == 1
-
-clean:
- -for %d in (odbc $(DBD_LIST)) do \
- devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_dbd_%d
- -for %d in ($(DBM_LIST) x) do if not %d == x \
- devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_dbm_%d
- -for %d in ($(CRYPTO_LIST) x) do if not %d == x \
- devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_crypto_%d
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_ldap
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libaprutil
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprutil
- cd $(API_PATH)
- -$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
- BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
- cd $(APU_PATH)
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libapriconv
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apriconv
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libaprapp
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprapp
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libapr
- -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr
-
-buildall:
- devenv aprutil.sln /useenv /build "$(SLNARCH)" /project aprapp
- devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libaprapp
- devenv aprutil.sln /useenv /build "$(SLNARCH)" /project aprutil
- devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libaprutil
- devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_ldap
- for %d in (odbc $(DBD_LIST)) do \
- devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_dbd_%d
- for %d in ($(DBM_LIST) x) do if not %d == x \
- devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_dbm_%d
- for %d in ($(CRYPTO_LIST) x) do if not %d == x \
- devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_crypto_%d
-
-!ELSE
-# $(USEDSP) == 1
-
-clean:
- -for %d in (odbc $(DBD_LIST)) do \
- msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)" /CLEAN
- -for %d in ($(DBM_LIST) x) do if not %d == x \
- msdev aprutil.dsw /USEENV /MAKE "apr_dbm_%d - $(ARCH)" /CLEAN
- -for %d in ($(CRYPTO_LIST) x) do if not %d == x \
- msdev aprutil.dsw /USEENV /MAKE "apr_crypto_%d - $(ARCH)" /CLEAN
- -msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)" /CLEAN
- -msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)" /CLEAN
- -msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)" /CLEAN
- cd $(API_PATH)
- $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
- BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
- cd $(APU_PATH)
- -msdev aprutil.dsw /USEENV /MAKE "libapriconv - $(ARCH)" /CLEAN
- -msdev aprutil.dsw /USEENV /MAKE "apriconv - $(ARCH)" /CLEAN
- -msdev aprutil.dsw /USEENV /MAKE "libaprapp - $(ARCH)" /CLEAN
- -msdev aprutil.dsw /USEENV /MAKE "aprapp - $(ARCH)" /CLEAN
- -msdev aprutil.dsw /USEENV /MAKE "libapr - $(ARCH)" /CLEAN
- -msdev aprutil.dsw /USEENV /MAKE "apr - $(ARCH)" /CLEAN
-
-buildall:
- @msdev aprutil.dsw /USEENV /MAKE "aprapp - $(ARCH)"
- @msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)"
- @msdev aprutil.dsw /USEENV /MAKE "libaprapp - $(ARCH)"
- @msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)"
- @msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)"
- @for %d in (odbc $(DBD_LIST)) do \
- msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)"
- @for %d in ($(DBM_LIST) x) do if not %d == x \
- msdev aprutil.dsw /USEENV /MAKE "apr_dbm_%d - $(ARCH)"
- @for %d in ($(CRYPTO_LIST) x) do if not %d == x \
- msdev aprutil.dsw /USEENV /MAKE "apr_crypto_%d - $(ARCH)"
-
-!ENDIF
-
-
-checkapr:
- cd $(APR_PATH)\test
- $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
- OUTDIR=$(LIBSOSPATH) check
- $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=dynamic \
- OUTDIR=$(ARCHOSPATH) check
- cd ..
- cd $(APU_PATH)
-
-checkapu:
- cd $(APU_PATH)
- cd test
- $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
- OUTDIR=$(LIBSPATH) APROUTDIR=$(LIBSOSPATH) \
- APR_PATH=..\$(APR_PATH) API_PATH=..\$(API_PATH) check
- $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=dynamic \
- OUTDIR=$(ARCHPATH) APROUTDIR=$(ARCHOSPATH) \
- APR_PATH=..\$(APR_PATH) API_PATH=..\$(API_PATH) check
- cd ..
-
-checkall: checkapr checkapu
-
-
-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)\bin\iconv\." mkdir "$(PREFIX)\bin\iconv"
- @if NOT EXIST "$(PREFIX)\include\." mkdir "$(PREFIX)\include"
- @if NOT EXIST "$(PREFIX)\lib\." mkdir "$(PREFIX)\lib"
- copy CHANGES "$(PREFIX)\CHANGES.txt" <.y
- copy LICENSE "$(PREFIX)\LICENSE.txt" <.y
- copy NOTICE "$(PREFIX)\NOTICE.txt" <.y
- xcopy $(APR_PATH)\include\*.h "$(PREFIX)\include\" /d < .a
- xcopy $(APU_PATH)\include\*.h "$(PREFIX)\include\" /d < .a
- copy $(APR_PATH)\$(LIBSOSPATH)\apr-1.lib "$(PREFIX)\lib\" <.y
- copy $(APR_PATH)\$(LIBSOSPATH)\apr-1.pdb "$(PREFIX)\lib\" <.y
- copy $(APU_PATH)\$(LIBSPATH)\aprutil-1.lib "$(PREFIX)\lib\" <.y
- copy $(APU_PATH)\$(LIBSPATH)\aprutil-1.pdb "$(PREFIX)\lib\" <.y
- copy $(APR_PATH)\$(ARCHOSPATH)\libapr-1.lib "$(PREFIX)\lib\" <.y
- copy $(APR_PATH)\$(ARCHOSPATH)\libapr-1.exp "$(PREFIX)\lib\" <.y
- copy $(APU_PATH)\$(ARCHPATH)\libaprutil-1.lib "$(PREFIX)\lib\" <.y
- copy $(APU_PATH)\$(ARCHPATH)\libaprutil-1.exp "$(PREFIX)\lib\" <.y
- copy $(APR_PATH)\$(ARCHOSPATH)\libapr-1.dll "$(PREFIX)\bin\" <.y
- copy $(APR_PATH)\$(ARCHOSPATH)\libapr-1.pdb "$(PREFIX)\bin\" <.y
- copy $(API_PATH)\$(ARCHPATH)\libapriconv-1.dll "$(PREFIX)\bin\" <.y
- copy $(API_PATH)\$(ARCHPATH)\libapriconv-1.pdb "$(PREFIX)\bin\" <.y
- copy $(APU_PATH)\$(ARCHPATH)\libaprutil-1.dll "$(PREFIX)\bin\" <.y
- copy $(APU_PATH)\$(ARCHPATH)\libaprutil-1.pdb "$(PREFIX)\bin\" <.y
- copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.dll "$(PREFIX)\bin\" <.y
- copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.pdb "$(PREFIX)\bin\" <.y
- for %d in (odbc $(DBD_LIST)) do ( \
- copy $(APU_PATH)\dbd\$(ARCHPATH)\apr_dbd_%d-1.dll "$(PREFIX)\bin\" <.y && \
- copy $(APU_PATH)\dbd\$(ARCHPATH)\apr_dbd_%d-1.pdb "$(PREFIX)\bin\" <.y \
- )
- for %d in ($(DBM_LIST) x) do if not %d == x ( \
- copy $(APU_PATH)\dbm\$(ARCHPATH)\apr_dbm_%d-1.dll "$(PREFIX)\bin\" <.y && \
- copy $(APU_PATH)\dbm\$(ARCHPATH)\apr_dbm_%d-1.pdb "$(PREFIX)\bin\" <.y \
- )
- for %d in ($(CRYPTO_LIST) x) do if not %d == x ( \
- copy $(APU_PATH)\crypto\$(ARCHPATH)\apr_crypto_%d-1.dll "$(PREFIX)\bin\" <.y && \
- copy $(APU_PATH)\crypto\$(ARCHPATH)\apr_crypto_%d-1.pdb "$(PREFIX)\bin\" <.y \
- )
- xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.so "$(PREFIX)\bin\iconv\" /d < .a
- xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.pdb "$(PREFIX)\bin\iconv\" /d < .a
- del .y
- del .a
-
diff --git a/contrib/apr-util/NOTICE b/contrib/apr-util/NOTICE
deleted file mode 100644
index 3ae54e128be8..000000000000
--- a/contrib/apr-util/NOTICE
+++ /dev/null
@@ -1,14 +0,0 @@
-Apache Portable Runtime Utility Library
-Copyright (c) 2000-2016 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, including various
-modifications by Spyglass Inc., Carnegie Mellon University, and
-Bell Communications Research, Inc (Bellcore).
diff --git a/contrib/apr-util/NWGNUmakefile b/contrib/apr-util/NWGNUmakefile
deleted file mode 100644
index cef05ee0dc2e..000000000000
--- a/contrib/apr-util/NWGNUmakefile
+++ /dev/null
@@ -1,310 +0,0 @@
-#
-# Declare the sub-directories to be built here
-#
-
-SUBDIRS = \
- ldap \
- xml \
- $(EOLIST)
-
-ifdef WITH_APR_DBD
-SUBDIRS += \
- dbd \
- $(EOLIST)
-endif
-
-ifdef WITH_APR_DBM
-SUBDIRS += \
- dbm \
- $(EOLIST)
-endif
-
-#
-# Get the 'head' of the build environment. This includes default targets and
-# paths to tools
-#
-
-include $(APR_WORK)/build/NWGNUhead.inc
-
-#
-# 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/arch/NetWare \
- $(APU)/include \
- $(APU)/uri \
- $(APU)/dbm/sdbm \
- $(APU)/include/private \
- $(APUXML)/expat/lib \
- $(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 =
-
-#
-# This is used by the link '-desc ' directive.
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION =
-
-#
-# This is used by the '-threadname' directive. If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME =
-#
-# If this is specified, it will override VERSION value in
-# $(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 = \
- $(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
- $(OBJDIR)/apulib.lib \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
- $(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
- $(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
- $(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
-
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
- $(EOLIST)
-
-#
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
- $(OBJDIR)/apr_base64.o \
- $(OBJDIR)/apr_brigade.o \
- $(OBJDIR)/apr_buckets.o \
- $(OBJDIR)/apr_buckets_alloc.o \
- $(OBJDIR)/apr_buckets_eos.o \
- $(OBJDIR)/apr_buckets_file.o \
- $(OBJDIR)/apr_buckets_flush.o \
- $(OBJDIR)/apr_buckets_heap.o \
- $(OBJDIR)/apr_buckets_mmap.o \
- $(OBJDIR)/apr_buckets_pipe.o \
- $(OBJDIR)/apr_buckets_pool.o \
- $(OBJDIR)/apr_buckets_refcount.o \
- $(OBJDIR)/apr_buckets_simple.o \
- $(OBJDIR)/apr_buckets_socket.o \
- $(OBJDIR)/apr_crypto.o \
- $(OBJDIR)/apr_date.o \
- $(OBJDIR)/apr_dbm.o \
- $(OBJDIR)/apr_dbd.o \
- $(OBJDIR)/apr_dbm_sdbm.o \
- $(OBJDIR)/apu_dso.o \
- $(OBJDIR)/apr_hooks.o \
- $(OBJDIR)/apr_md4.o \
- $(OBJDIR)/apr_md5.o \
- $(OBJDIR)/apr_memcache.o \
- $(OBJDIR)/apr_passwd.o \
- $(OBJDIR)/apr_queue.o \
- $(OBJDIR)/apr_redis.o \
- $(OBJDIR)/apr_reslist.o \
- $(OBJDIR)/apr_rmm.o \
- $(OBJDIR)/apr_sha1.o \
- $(OBJDIR)/apr_siphash.o \
- $(OBJDIR)/apu_version.o \
- $(OBJDIR)/getuuid.o \
- $(OBJDIR)/uuid.o \
- $(OBJDIR)/apr_strmatch.o \
- $(OBJDIR)/apr_thread_pool.o \
- $(OBJDIR)/apr_uri.o \
- $(OBJDIR)/crypt_blowfish.o \
- $(OBJDIR)/sdbm.o \
- $(OBJDIR)/sdbm_hash.o \
- $(OBJDIR)/sdbm_lock.o \
- $(OBJDIR)/sdbm_pair.o \
- $(OBJDIR)/xlate.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 FORCE
-
-#
-# Any specialized rules here
-#
-
-vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:redis:misc:strmatch:uri:xlate:xml
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(APRBUILD)/NWGNUtail.inc
-
-
diff --git a/contrib/apr-util/README b/contrib/apr-util/README
deleted file mode 100644
index 9ea474d8faba..000000000000
--- a/contrib/apr-util/README
+++ /dev/null
@@ -1,111 +0,0 @@
-Apache Portable Runtime Utility Library README
-----------------------------------------------
-
- The Apache Portable Runtime Utility Library provides a predictable
- and consistent interface to underlying client library interfaces.
- This API assures predictable if not identical behavior regardless
- of which libraries are available on a given platform.
-
- APR and its companion libraries are implemented entirely in C
- and provide a common programming interface across a wide variety
- of operating system platforms without sacrificing performance.
- Currently supported platforms include:
-
- UNIX variants
- Windows
- Netware
- Mac OS X
- OS/2
-
- To give a brief overview, the primary core
- subsystems of APR-util 1.3 include the following:
-
- Hashing and UUID services
- Multiple SQL DBD client interfaces
- Multiple flat-database DBM client interfaces
- Typesafe function Hooks abstraction
- LDAP SSL connections for a variety of LDAP toolkits
- MemCache interface
- Date parsing rourtines
- Resource Lists
- Thread Pools
- Queues
- Relocatable Memory Management functions
- String filename-style pattern matching
- URI Parsing
- Charset translation (iconv based)
- XML parsing (expat)
-
- For a more complete list, please refer to the following URLs:
-
- http://apr.apache.org/docs/apr-util/modules.html
-
- Users of APR 0.9 should be aware that migrating to the APR 1.x
- programming interfaces may require some adjustments; APR 1.x is
- neither source nor binary compatible with earlier APR 0.9 releases.
- Users of APR 1.x can expect consistent interfaces and binary backwards
- compatibility throughout the entire APR 1.x release cycle, as defined
- in our versioning rules:
-
- http://apr.apache.org/versioning.html
-
- APR is already used extensively by the Apache HTTP Server
- version 2 and the Subversion revision control system, to
- name but a few. We list all known projects using APR at
- http://apr.apache.org/projects.html -- so please let us know
- if you find our libraries useful in your own projects!
-
-
-Database Providers
-------------------
-As of apr-util version 1.2.11, MySQL DBD driver is shipped as part of the
-distribution. However, to avoid licensing incompatibilities, it is not
-built by default. To enable MySQL support, use the --with-mysql option,
-but be aware that the MySQL license may introduce licensing implications
-for your compiled code. Similarly, the bindings for propritary drivers
-such as Oracle (--with-oracle option) must also be explicitly enabled.
-
-On windows, selection of supported drivers is via the environment values
-DBD_LIST (for mysql, oracle, pgsql, sqlite2 and/or sqlite3)
-and DBM_LIST (db and/or gdbm). DBD odbc and DBM sdbm are unconditionally
-compiled and installed, do not include these in the list.
-
-Whenever distributing apr-util in combination with database client
-drivers, always review the license requirements of all components.
-
-
-Cryptographic Software Notice
------------------------------
-This distribution includes cryptographic software. The country in
-which you currently reside may have restrictions on the import,
-possession, use, and/or re-export to another country, of
-encryption software. BEFORE using any encryption software, please
-check your country's laws, regulations and policies concerning the
-import, possession, or use, and re-export of encryption software, to
-see if this is permitted. See http://www.wassenaar.org/ for more
-information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export Commodity
-Control Number (ECCN) 5D002.C.1, which includes information security
-software using or performing cryptographic functions with asymmetric
-algorithms. The form and manner of this Apache Software Foundation
-distribution makes it eligible for export under the License Exception
-ENC Technology Software Unrestricted (TSU) exception (see the BIS
-Export Administration Regulations, Section 740.13) for both object
-code and source code.
-
-The following provides more details on the included cryptographic
-software:
-
- APR-Util provides an abstract interface for symmetrical cryptographic
- functions that make use of a general-purpose encryption library,
- such as OpenSSL, NSS, or the operating system's platform-specific
- facilities. This interface is known as the apr_crypto interface,
- with implementation beneath the /crypto directory.
-
- APR-Util provides an abstract interface for SSL encrypted LDAP (ldaps
- and STARTTLS style) connections, which can be powered by OpenLDAP,
- Netscape LDAP SDK, Mozilla LDAP SDK, or other platform specific ldap
- interfaces.
-
diff --git a/contrib/apr-util/README.FREETDS b/contrib/apr-util/README.FREETDS
deleted file mode 100644
index 4066a9c78b38..000000000000
--- a/contrib/apr-util/README.FREETDS
+++ /dev/null
@@ -1,11 +0,0 @@
-The APR DBD Driver for FreeTDS has been removed from the build.
-It is known to have problems, and we are not able to maintain it.
-
-The source code is still available. If you want it and are able
-to manage maintenance for yourself, you can patch the build and
-work through issues that affect you, but you're on your own.
-
-We expect that for most users, the ODBC driver will serve as
-an alternative.
-
-Sorry.
diff --git a/contrib/apr-util/README.cmake b/contrib/apr-util/README.cmake
deleted file mode 100644
index 85de33a21e95..000000000000
--- a/contrib/apr-util/README.cmake
+++ /dev/null
@@ -1,139 +0,0 @@
-Experimental cmake-based build support for APR-Util on Microsoft Windows
-
-Status
-------
-
-This build support is currently intended only for Microsoft Windows.
-Only Windows NT-based systems can be targeted. (The traditional
-Windows build support for APR can target Windows 9x as well.)
-
-This build support is experimental. Specifically,
-
-* It does not support all features of APR-Util.
-* Some components may not be built correctly and/or in a manner
- compatible with the previous Windows build support.
-* Build interfaces, such as the mechanisms which are used to enable
- optional functionality or specify prerequisites, may change from
- release to release as feedback is received from users and bugs and
- limitations are resolved.
-
-Important: Refer to the "Known Bugs and Limitations" section for further
- information.
-
- It is beyond the scope of this document to document or explain
- how to utilize the various cmake features, such as different
- build backends or provisions for finding support libraries.
-
- Please refer to the cmake documentation for additional information
- that applies to building any project with cmake.
-
-Prerequisites
--------------
-
-The following tools must be in PATH:
-
-* cmake, version 2.8 or later
- cmake version 3.1.3 or later is required to work with current OpenSSL
- releases. (OpenSSL is an optional prerequisite of APR-Util.)
-* If using a command-line compiler: compiler and linker and related tools
- (Refer to the cmake documentation for more information.)
-
-The following support libraries are mandatory:
-
-* APR 1.4.x or APR 1.5.x, built with cmake
-
-Optional support libraries allow optional features of APR to be enabled:
-
-* OpenSSL
-* many others potentially, though the build support isn't currently
- implemented
-
-How to build
-------------
-
-1. cd to a clean directory for building (i.e., don't build in your
- source tree)
-
-2. Some cmake backends may want your compile tools in PATH. (Hint: "Visual
- Studio Command Prompt")
-
-3. set CMAKE_LIBRARY_PATH=d:\path\to\prereq1\lib;d:\path\to\prereq2\lib;...
-
-4. set CMAKE_INCLUDE_PATH=d:\path\to\prereq1\include;d:\path\to\prereq2\include;...
-
-5. cmake -G "some backend, like 'NMake Makefiles'"
- -DCMAKE_INSTALL_PREFIX=d:/path/to/aprinst
- -DAPR-Util-specific-flags
- d:/path/to/aprutilsource
-
- If APR 1.x was installed to a different directory than APR-Util,
- also pass these additional arguments:
-
- -DAPR_INCLUDE_DIR=d:/path/to/apr1inst/include
- -DAPR_LIBRARIES=d:/path/to/apr1inst/lib/libapr-1.lib
-
- Alternately, use cmake-gui and update settings in the GUI.
-
- APR-Util feature flags:
-
- APU_HAVE_CRYPTO Build crypt support (only the OpenSSL
- implementation is currently supported)
- Default: OFF
- APU_HAVE_ODBC Build ODBC DBD driver
- Default: ON
- APR_BUILD_TESTAPR Build APR-Util test suite
- Default: OFF
- TEST_STATIC_LIBS Build the test suite to test the APR static
- library instead of the APR dynamic library.
- Default: OFF
- In order to build the test suite against both
- static and dynamic libraries, separate builds
- will be required, one with TEST_STATIC_LIBS
- set to ON.
- INSTALL_PDB Install .pdb files if generated.
- Default: ON
-
- CMAKE_C_FLAGS_RELEASE, _DEBUG, _RELWITHDEBINFO, _MINSIZEREL
-
- CMAKE_BUILD_TYPE
-
- For NMake Makefiles the choices are at least DEBUG, RELEASE,
- RELWITHDEBINFO, and MINSIZEREL
- Other backends make have other selections.
-
-6. build using chosen backend (e.g., "nmake install")
-
-Known Bugs and Limitations
---------------------------
-
-* If include/apu.h or other generated files have been created in the source
- directory by another build system, they will be used unexpectedly and
- cause the build to fail.
-* Options should be provided for remaining features, along with finding any
- necessary libraries
- + DBM:
- . APU_HAVE_GDBM
- . APU_HAVE_NDBM
- . APU_HAVE_DB
- + DBD:
- . APU_HAVE_PGSQL
- . APU_HAVE_MYSQL
- . APU_HAVE_SQLITE3
- . APU_HAVE_SQLITE2
- . APU_HAVE_ORACLE
- + CRYPTO:
- . APU_HAVE_NSS
- + XLATE, APU_HAVE_ICONV (no way to consume an apr-iconv build yet)
-* Static builds of APR modules are not supported.
-* CHANGES/LICENSE/NOTICE is not installed, unlike Makefile.win.
- (But unlike Makefile.win we want to call them APR-Util-CHANGES.txt
- and so on.) But perhaps that is a job for a higher-level script.
-
-Generally:
-
-* Many APR-Util features have not been tested with this build.
-* Developers need to examine the existing Windows build in great detail and see
- what is missing from the cmake-based build, whether a feature or some build
- nuance.
-* Any feedback you can provide on your experiences with this build will be
- helpful.
diff --git a/contrib/apr-util/apr-util.pc.in b/contrib/apr-util/apr-util.pc.in
deleted file mode 100644
index 5b146af3de81..000000000000
--- a/contrib/apr-util/apr-util.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@
-includedir=@includedir@
-
-Name: APR Utils
-Description: Companion library for APR
-Version: @APRUTIL_DOTTED_VERSION@
-# assume that apr-util requires libapr of same major version
-Requires: apr-@APRUTIL_MAJOR_VERSION@
-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@
-Cflags: -I${includedir}
diff --git a/contrib/apr-util/apr-util.spec b/contrib/apr-util/apr-util.spec
deleted file mode 100644
index 18fdea1c529f..000000000000
--- a/contrib/apr-util/apr-util.spec
+++ /dev/null
@@ -1,200 +0,0 @@
-
-%define apuver 1
-
-Summary: Apache Portable Runtime Utility library
-Name: apr-util
-Version: 1.6.1
-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, apr-devel >= 1.4.0
-BuildRequires: expat-devel, libuuid-devel
-
-%description
-The mission of the Apache Portable Runtime (APR) is to provide a
-free library of C data structures and routines. This library
-contains additional utility interfaces for APR; including support
-for XML, LDAP, database interfaces, URI parsing and more.
-
-%package devel
-Group: Development/Libraries
-Summary: APR utility library development kit
-Requires: apr-util = %{version}-%{release}, apr-devel
-Requires: db4-devel, expat-devel
-
-%description devel
-This package provides the support files which can be used to
-build applications using the APR utility library. The mission
-of the Apache Portable Runtime (APR) is to provide a free
-library of C data structures and routines.
-
-%package dbm
-Group: Development/Libraries
-Summary: APR utility library DBM driver
-BuildRequires: db4-devel
-Requires: apr-util = %{version}-%{release}
-
-%description dbm
-This package provides the DBM driver for the apr-util.
-
-%package pgsql
-Group: Development/Libraries
-Summary: APR utility library PostgreSQL DBD driver
-BuildRequires: postgresql-devel
-Requires: apr-util = %{version}-%{release}
-
-%description pgsql
-This package provides the PostgreSQL driver for the apr-util
-DBD (database abstraction) interface.
-
-%package mysql
-Group: Development/Libraries
-Summary: APR utility library MySQL DBD driver
-BuildRequires: mysql-devel
-Requires: apr-util = %{version}-%{release}
-
-%description mysql
-This package provides the MySQL driver for the apr-util DBD
-(database abstraction) interface.
-
-%package sqlite
-Group: Development/Libraries
-Summary: APR utility library SQLite DBD driver
-BuildRequires: sqlite-devel >= 3.0.0
-Requires: apr-util = %{version}-%{release}
-
-%description sqlite
-This package provides the SQLite driver for the apr-util DBD
-(database abstraction) interface.
-
-%package odbc
-Group: Development/Libraries
-Summary: APR utility library ODBC DBD driver
-BuildRequires: unixODBC-devel
-Requires: apr-util = %{version}-%{release}
-
-%description odbc
-This package provides the ODBC driver for the apr-util DBD
-(database abstraction) interface.
-
-%package ldap
-Group: Development/Libraries
-Summary: APR utility library LDAP support
-BuildRequires: openldap-devel
-Requires: apr-util = %{version}-%{release}
-
-%description ldap
-This package provides the LDAP support for the apr-util.
-
-%package openssl
-Group: Development/Libraries
-Summary: APR utility library OpenSSL crypto support
-BuildRequires: openssl-devel
-Requires: apr-util = %{version}-%{release}
-
-%description openssl
-This package provides crypto support for apr-util based on OpenSSL.
-
-%package nss
-Group: Development/Libraries
-Summary: APR utility library NSS crypto support
-BuildRequires: nss-devel
-Requires: apr-util = %{version}-%{release}
-
-%description nss
-This package provides crypto support for apr-util based on Mozilla NSS.
-
-%prep
-%setup -q
-
-%build
-%configure --with-apr=%{_prefix} \
- --includedir=%{_includedir}/apr-%{apuver} \
- --with-ldap --without-gdbm \
- --with-sqlite3 --with-pgsql --with-mysql --with-odbc \
- --with-berkeley-db \
- --with-crypto --with-openssl --with-nss \
- --without-sqlite2
-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
-
-# Documentation
-mv docs/dox/html html
-
-# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/aprutil.exp
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc CHANGES LICENSE NOTICE
-%{_libdir}/libaprutil-%{apuver}.so.*
-%dir %{_libdir}/apr-util-%{apuver}
-
-%files dbm
-%defattr(-,root,root,-)
-%{_libdir}/apr-util-%{apuver}/apr_dbm_db*
-
-%files pgsql
-%defattr(-,root,root,-)
-%{_libdir}/apr-util-%{apuver}/apr_dbd_pgsql*
-
-%files mysql
-%defattr(-,root,root,-)
-%{_libdir}/apr-util-%{apuver}/apr_dbd_mysql*
-
-%files sqlite
-%defattr(-,root,root,-)
-%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
-
-%files odbc
-%defattr(-,root,root,-)
-%{_libdir}/apr-util-%{apuver}/apr_dbd_odbc*
-
-%files ldap
-%defattr(-,root,root,-)
-%{_libdir}/apr-util-%{apuver}/apr_ldap*
-
-%files openssl
-%defattr(-,root,root,-)
-%{_libdir}/apr-util-%{apuver}/apr_crypto_openssl*
-
-%files nss
-%defattr(-,root,root,-)
-%{_libdir}/apr-util-%{apuver}/apr_crypto_nss*
-
-%files devel
-%defattr(-,root,root,-)
-%{_bindir}/apu-%{apuver}-config
-%{_libdir}/libaprutil-%{apuver}.*a
-%{_libdir}/libaprutil-%{apuver}.so
-%{_libdir}/pkgconfig/apr-util-%{apuver}.pc
-%{_includedir}/apr-%{apuver}/*.h
-%doc html
-
-%changelog
-* Tue Jun 22 2004 Graham Leggett <minfrin@sharp.fm> 1.0.0-1
-- update to support v1.0.0 of APR
-
-* Tue Jun 22 2004 Graham Leggett <minfrin@sharp.fm> 1.0.0-1
-- derived from Fedora Core apr.spec
-
diff --git a/contrib/apr-util/aprutil.dsw b/contrib/apr-util/aprutil.dsw
deleted file mode 100644
index a2976ccc5989..000000000000
--- a/contrib/apr-util/aprutil.dsw
+++ /dev/null
@@ -1,443 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "apr"="..\apr\apr.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "apr_crypto_nss"=".\crypto\apr_crypto_nss.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apr_crypto_openssl"=".\crypto\apr_crypto_openssl.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apr_dbd_mysql"=".\dbd\apr_dbd_mysql.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apr_dbd_odbc"=".\dbd\apr_dbd_odbc.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apr_dbd_oracle"=".\dbd\apr_dbd_oracle.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apr_dbd_pgsql"=".\dbd\apr_dbd_pgsql.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apr_dbd_sqlite2"=".\dbd\apr_dbd_sqlite2.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apr_dbd_sqlite3"=".\dbd\apr_dbd_sqlite3.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apr_dbm_db"=".\dbm\apr_dbm_db.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apr_dbm_gdbm"=".\dbm\apr_dbm_gdbm.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apr_ldap"=".\ldap\apr_ldap.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "aprapp"="..\apr\build\aprapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name preaprapp
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "apriconv"="..\apr-iconv\apriconv.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name preapriconv
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "aprutil"=".\aprutil.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name preaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name apriconv
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libapr"="..\apr\libapr.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libaprapp"="..\apr\build\libaprapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name prelibaprapp
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libapriconv"="..\apr-iconv\libapriconv.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libapriconv_ccs_modules"="..\apr-iconv\ccs\libapriconv_ccs_modules.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libapriconv
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libapriconv_ces_modules"="..\apr-iconv\ces\libapriconv_ces_modules.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libapriconv
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libaprutil"=".\libaprutil.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprapp
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libapriconv
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libapriconv_ccs_modules
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libapriconv_ces_modules
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "preaprapp"="..\apr\build\preaprapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name apr
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "preapriconv"="..\apr-iconv\build\preapriconv.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name apr
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "preaprutil"=".\build\preaprutil.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name apr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name aprapp
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "prelibaprapp"="..\apr\build\prelibaprapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/contrib/apr-util/apu-config.in b/contrib/apr-util/apu-config.in
deleted file mode 100644
index 82109e52d065..000000000000
--- a/contrib/apr-util/apu-config.in
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# APR-util script designed to allow easy command line access to APR-util
-# configuration parameters.
-
-APRUTIL_MAJOR_VERSION="@APRUTIL_MAJOR_VERSION@"
-APRUTIL_DOTTED_VERSION="@APRUTIL_DOTTED_VERSION@"
-
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-bindir="@bindir@"
-libdir="@libdir@"
-includedir="@includedir@"
-
-LIBS="@APRUTIL_EXPORT_LIBS@"
-INCLUDES="@APRUTIL_INCLUDES@"
-LDFLAGS="@APRUTIL_LDFLAGS@"
-LDAP_LIBS="@LDADD_ldap@"
-DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
-
-APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
-
-APU_SOURCE_DIR="@abs_srcdir@"
-APU_BUILD_DIR="@abs_builddir@"
-APR_XML_EXPAT_OLD="@APR_XML_EXPAT_OLD@"
-APU_DB_VERSION="@apu_db_version@"
-
-# NOTE: the following line is modified during 'make install': alter with care!
-location=@APU_CONFIG_LOCATION@
-
-show_usage()
-{
- cat << EOF
-Usage: apu-$APRUTIL_MAJOR_VERSION-config [OPTION]
-
-Known values for OPTION are:
- --prefix[=DIR] change prefix to DIR
- --bindir print location where binaries are installed
- --includes print include information
- --includedir print location where headers are installed
- --ldflags print linker flags
- --libs print library information
- --avoid-ldap do not include ldap library information with --libs
- --ldap-libs print library information to link with ldap
- --avoid-dbm do not include DBM library information with --libs
- --dbm-libs print additional library information to link with DBM
- --srcdir print APR-util source directory
- --link-ld print link switch(es) for linking to APR-util
- --link-libtool print the libtool inputs for linking to APR-util
- --apu-la-file print the path to the .la file, if available
- --old-expat indicate if APR-util was built against an old expat
- --db-version print the DB version
- --version print APR-util's version as a dotted triple
- --help print this help
-
-When linking with libtool, an application should do something like:
- APU_LIBS="\`apu-$APRUTIL_MAJOR_VERSION-config --link-libtool --libs\`"
-or when linking directly:
- APU_LIBS="\`apu-$APRUTIL_MAJOR_VERSION-config --link-ld --libs\`"
-
-An application should use the results of --includes, and --ldflags in
-their build process.
-EOF
-}
-
-if test $# -eq 0; then
- show_usage
- exit 1
-fi
-
-if test "$location" = "installed"; then
- LA_FILE="$libdir/lib${APRUTIL_LIBNAME}.la"
-else
- LA_FILE="$APU_BUILD_DIR/lib${APRUTIL_LIBNAME}.la"
-fi
-
-flags=""
-
-while test $# -gt 0; do
- # Normalize the prefix.
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case "$1" in
- # It is possible for the user to override our prefix.
- --prefix=*)
- prefix=$optarg
- ;;
- --prefix)
- echo $prefix
- exit 0
- ;;
- --bindir)
- echo $bindir
- exit 0
- ;;
- --avoid-ldap)
- LDAP_LIBS=""
- ;;
- --avoid-dbm)
- DBM_LIBS=""
- ;;
- --libs)
- flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
- ;;
- --ldap-libs)
- flags="$flags $LDAP_LIBS"
- ;;
- --dbm-libs)
- flags="$flags $DBM_LIBS"
- ;;
- --includedir)
- if test "$location" = "installed"; then
- flags="$includedir"
- elif test "$location" = "source"; then
- flags="$APU_SOURCE_DIR/include"
- else
- # this is for VPATH builds
- flags="$APU_BUILD_DIR/include $APU_SOURCE_DIR/include"
- fi
- echo $flags
- exit 0
- ;;
- --includes)
- if test "$location" = "installed"; then
- flags="$flags -I$includedir $INCLUDES"
- elif test "$location" = "source"; then
- flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
- else
- # this is for VPATH builds
- flags="$flags -I$APU_BUILD_DIR/include -I$APU_SOURCE_DIR/include $INCLUDES"
- fi
- ;;
- --ldflags)
- flags="$flags $LDFLAGS"
- ;;
- --srcdir)
- echo $APU_SOURCE_DIR
- exit 0
- ;;
- --version)
- echo $APRUTIL_DOTTED_VERSION
- exit 0
- ;;
- --link-ld)
- if test "$location" = "installed"; then
- ### avoid using -L if libdir is a "standard" location like /usr/lib
- flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
- else
- flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
- fi
- ;;
- --link-libtool)
- # If the LA_FILE exists where we think it should be, use it. If we're
- # installed and the LA_FILE does not exist, assume to use -L/-l
- # (the LA_FILE may not have been installed). If we're building ourselves,
- # we'll assume that at some point the .la file be created.
- if test -f "$LA_FILE"; then
- flags="$flags $LA_FILE"
- elif test "$location" = "installed"; then
- ### avoid using -L if libdir is a "standard" location like /usr/lib
- # Since the user is specifying they are linking with libtool, we
- # *know* that -R will be recognized by libtool.
- flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME"
- else
- flags="$flags $LA_FILE"
- fi
- ;;
- --apu-la-file)
- if test -f "$LA_FILE"; then
- flags="$flags $LA_FILE"
- fi
- ;;
- --old-expat)
- if test ! -n "$APR_XML_EXPAT_OLD"; then
- echo "no"
- else
- echo "$APR_XML_EXPAT_OLD"
- fi
- exit 0
- ;;
- --db-version)
- echo $APU_DB_VERSION
- exit 0
- ;;
- --help)
- show_usage
- exit 0
- ;;
- *)
- show_usage
- exit 1
- ;;
- esac
-
- # Next please.
- shift
-done
-
-if test -n "$flags"; then
- echo "$flags"
-fi
-
-exit 0
diff --git a/contrib/apr-util/buckets/apr_brigade.c b/contrib/apr-util/buckets/apr_brigade.c
deleted file mode 100644
index 1f2ba1729963..000000000000
--- a/contrib/apr-util/buckets/apr_brigade.c
+++ /dev/null
@@ -1,736 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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_pools.h"
-#include "apr_tables.h"
-#include "apr_buckets.h"
-#include "apr_errno.h"
-#define APR_WANT_MEMFUNC
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-
-#if APR_HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
-static apr_status_t brigade_cleanup(void *data)
-{
- return apr_brigade_cleanup(data);
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_cleanup(void *data)
-{
- apr_bucket_brigade *b = data;
- apr_bucket *e;
-
- while (!APR_BRIGADE_EMPTY(b)) {
- e = APR_BRIGADE_FIRST(b);
- apr_bucket_delete(e);
- }
- /* We don't need to free(bb) because it's allocated from a pool. */
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_destroy(apr_bucket_brigade *b)
-{
- apr_pool_cleanup_kill(b->p, b, brigade_cleanup);
- return apr_brigade_cleanup(b);
-}
-
-APU_DECLARE(apr_bucket_brigade *) apr_brigade_create(apr_pool_t *p,
- apr_bucket_alloc_t *list)
-{
- apr_bucket_brigade *b;
-
- b = apr_palloc(p, sizeof(*b));
- b->p = p;
- b->bucket_alloc = list;
-
- APR_RING_INIT(&b->list, apr_bucket, link);
-
- apr_pool_cleanup_register(b->p, b, brigade_cleanup, apr_pool_cleanup_null);
- return b;
-}
-
-APU_DECLARE(apr_bucket_brigade *) apr_brigade_split_ex(apr_bucket_brigade *b,
- apr_bucket *e,
- apr_bucket_brigade *a)
-{
- apr_bucket *f;
-
- if (!a) {
- a = apr_brigade_create(b->p, b->bucket_alloc);
- }
- else if (!APR_BRIGADE_EMPTY(a)) {
- apr_brigade_cleanup(a);
- }
- /* Return an empty brigade if there is nothing left in
- * the first brigade to split off
- */
- if (e != APR_BRIGADE_SENTINEL(b)) {
- f = APR_RING_LAST(&b->list);
- APR_RING_UNSPLICE(e, f, link);
- APR_RING_SPLICE_HEAD(&a->list, e, f, apr_bucket, link);
- }
-
- APR_BRIGADE_CHECK_CONSISTENCY(a);
- APR_BRIGADE_CHECK_CONSISTENCY(b);
-
- return a;
-}
-
-APU_DECLARE(apr_bucket_brigade *) apr_brigade_split(apr_bucket_brigade *b,
- apr_bucket *e)
-{
- return apr_brigade_split_ex(b, e, NULL);
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
- apr_off_t point,
- apr_bucket **after_point)
-{
- apr_bucket *e;
- const char *s;
- apr_size_t len;
- apr_uint64_t point64;
- apr_status_t rv;
-
- if (point < 0) {
- /* this could cause weird (not necessarily SEGV) things to happen */
- return APR_EINVAL;
- }
- if (point == 0) {
- *after_point = APR_BRIGADE_FIRST(b);
- return APR_SUCCESS;
- }
-
- /*
- * Try to reduce the following casting mess: We know that point will be
- * larger equal 0 now and forever and thus that point (apr_off_t) and
- * apr_size_t will fit into apr_uint64_t in any case.
- */
- point64 = (apr_uint64_t)point;
-
- APR_BRIGADE_CHECK_CONSISTENCY(b);
-
- for (e = APR_BRIGADE_FIRST(b);
- e != APR_BRIGADE_SENTINEL(b);
- e = APR_BUCKET_NEXT(e))
- {
- /* For an unknown length bucket, while 'point64' is beyond the possible
- * size contained in apr_size_t, read and continue...
- */
- if ((e->length == (apr_size_t)(-1))
- && (point64 > (apr_uint64_t)APR_SIZE_MAX)) {
- /* point64 is too far out to simply split this bucket,
- * we must fix this bucket's size and keep going... */
- rv = apr_bucket_read(e, &s, &len, APR_BLOCK_READ);
- if (rv != APR_SUCCESS) {
- *after_point = e;
- return rv;
- }
- }
- else if ((point64 < (apr_uint64_t)e->length)
- || (e->length == (apr_size_t)(-1))) {
- /* We already consumed buckets where point64 is beyond
- * our interest ( point64 > APR_SIZE_MAX ), above.
- * Here point falls between 0 and APR_SIZE_MAX
- * and is within this bucket, or this bucket's len
- * is undefined, so now we are ready to split it.
- * First try to split the bucket natively... */
- if ((rv = apr_bucket_split(e, (apr_size_t)point64))
- != APR_ENOTIMPL) {
- *after_point = APR_BUCKET_NEXT(e);
- return rv;
- }
-
- /* if the bucket cannot be split, we must read from it,
- * changing its type to one that can be split */
- rv = apr_bucket_read(e, &s, &len, APR_BLOCK_READ);
- if (rv != APR_SUCCESS) {
- *after_point = e;
- return rv;
- }
-
- /* this assumes that len == e->length, which is okay because e
- * might have been morphed by the apr_bucket_read() above, but
- * if it was, the length would have been adjusted appropriately */
- if (point64 < (apr_uint64_t)e->length) {
- rv = apr_bucket_split(e, (apr_size_t)point64);
- *after_point = APR_BUCKET_NEXT(e);
- return rv;
- }
- }
- if (point64 == (apr_uint64_t)e->length) {
- *after_point = APR_BUCKET_NEXT(e);
- return APR_SUCCESS;
- }
- point64 -= (apr_uint64_t)e->length;
- }
- *after_point = APR_BRIGADE_SENTINEL(b);
- return APR_INCOMPLETE;
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_length(apr_bucket_brigade *bb,
- int read_all, apr_off_t *length)
-{
- apr_off_t total = 0;
- apr_bucket *bkt;
- apr_status_t status = APR_SUCCESS;
-
- for (bkt = APR_BRIGADE_FIRST(bb);
- bkt != APR_BRIGADE_SENTINEL(bb);
- bkt = APR_BUCKET_NEXT(bkt))
- {
- if (bkt->length == (apr_size_t)(-1)) {
- const char *ignore;
- apr_size_t len;
-
- if (!read_all) {
- total = -1;
- break;
- }
-
- if ((status = apr_bucket_read(bkt, &ignore, &len,
- APR_BLOCK_READ)) != APR_SUCCESS) {
- break;
- }
- }
-
- total += bkt->length;
- }
-
- *length = total;
- return status;
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_flatten(apr_bucket_brigade *bb,
- char *c, apr_size_t *len)
-{
- apr_size_t actual = 0;
- apr_bucket *b;
-
- for (b = APR_BRIGADE_FIRST(bb);
- b != APR_BRIGADE_SENTINEL(bb);
- b = APR_BUCKET_NEXT(b))
- {
- const char *str;
- apr_size_t str_len;
- apr_status_t status;
-
- status = apr_bucket_read(b, &str, &str_len, APR_BLOCK_READ);
- if (status != APR_SUCCESS) {
- return status;
- }
-
- /* If we would overflow. */
- if (str_len + actual > *len) {
- str_len = *len - actual;
- }
-
- /* XXX: It appears that overflow of the final bucket
- * is DISCARDED without any warning to the caller.
- *
- * No, we only copy the data up to their requested size. -- jre
- */
- memcpy(c, str, str_len);
-
- c += str_len;
- actual += str_len;
-
- /* This could probably be actual == *len, but be safe from stray
- * photons. */
- if (actual >= *len) {
- break;
- }
- }
-
- *len = actual;
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_pflatten(apr_bucket_brigade *bb,
- char **c,
- apr_size_t *len,
- apr_pool_t *pool)
-{
- apr_off_t actual;
- apr_size_t total;
- apr_status_t rv;
-
- apr_brigade_length(bb, 1, &actual);
-
- /* XXX: This is dangerous beyond belief. At least in the
- * apr_brigade_flatten case, the user explicitly stated their
- * buffer length - so we don't up and palloc 4GB for a single
- * file bucket. This API must grow a useful max boundry,
- * either compiled-in or preset via the *len value.
- *
- * Shouldn't both fn's grow an additional return value for
- * the case that the brigade couldn't be flattened into the
- * provided or allocated buffer (such as APR_EMOREDATA?)
- * Not a failure, simply an advisory result.
- */
- total = (apr_size_t)actual;
-
- *c = apr_palloc(pool, total);
-
- rv = apr_brigade_flatten(bb, *c, &total);
-
- if (rv != APR_SUCCESS) {
- return rv;
- }
-
- *len = total;
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_split_line(apr_bucket_brigade *bbOut,
- apr_bucket_brigade *bbIn,
- apr_read_type_e block,
- apr_off_t maxbytes)
-{
- apr_off_t readbytes = 0;
-
- while (!APR_BRIGADE_EMPTY(bbIn)) {
- const char *pos;
- const char *str;
- apr_size_t len;
- apr_status_t rv;
- apr_bucket *e;
-
- e = APR_BRIGADE_FIRST(bbIn);
- rv = apr_bucket_read(e, &str, &len, block);
-
- if (rv != APR_SUCCESS) {
- return rv;
- }
-
- pos = memchr(str, APR_ASCII_LF, len);
- /* We found a match. */
- if (pos != NULL) {
- apr_bucket_split(e, pos - str + 1);
- APR_BUCKET_REMOVE(e);
- APR_BRIGADE_INSERT_TAIL(bbOut, e);
- return APR_SUCCESS;
- }
- APR_BUCKET_REMOVE(e);
- if (APR_BUCKET_IS_METADATA(e) || len > APR_BUCKET_BUFF_SIZE/4) {
- APR_BRIGADE_INSERT_TAIL(bbOut, e);
- }
- else {
- if (len > 0) {
- rv = apr_brigade_write(bbOut, NULL, NULL, str, len);
- if (rv != APR_SUCCESS) {
- return rv;
- }
- }
- apr_bucket_destroy(e);
- }
- readbytes += len;
- /* We didn't find an APR_ASCII_LF within the maximum line length. */
- if (readbytes >= maxbytes) {
- break;
- }
- }
-
- return APR_SUCCESS;
-}
-
-
-APU_DECLARE(apr_status_t) apr_brigade_to_iovec(apr_bucket_brigade *b,
- struct iovec *vec, int *nvec)
-{
- int left = *nvec;
- apr_bucket *e;
- struct iovec *orig;
- apr_size_t iov_len;
- const char *iov_base;
- apr_status_t rv;
-
- orig = vec;
-
- for (e = APR_BRIGADE_FIRST(b);
- e != APR_BRIGADE_SENTINEL(b);
- e = APR_BUCKET_NEXT(e))
- {
- if (left-- == 0)
- break;
-
- rv = apr_bucket_read(e, &iov_base, &iov_len, APR_NONBLOCK_READ);
- if (rv != APR_SUCCESS)
- return rv;
- /* Set indirectly since types differ: */
- vec->iov_len = iov_len;
- vec->iov_base = (void *)iov_base;
- ++vec;
- }
-
- *nvec = (int)(vec - orig);
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_vputstrs(apr_bucket_brigade *b,
- apr_brigade_flush flush,
- void *ctx,
- va_list va)
-{
-#define MAX_VECS 8
- struct iovec vec[MAX_VECS];
- apr_size_t i = 0;
-
- for (;;) {
- char *str = va_arg(va, char *);
- apr_status_t rv;
-
- if (str == NULL)
- break;
-
- vec[i].iov_base = str;
- vec[i].iov_len = strlen(str);
- i++;
-
- if (i == MAX_VECS) {
- rv = apr_brigade_writev(b, flush, ctx, vec, i);
- if (rv != APR_SUCCESS)
- return rv;
- i = 0;
- }
- }
- if (i != 0)
- return apr_brigade_writev(b, flush, ctx, vec, i);
-
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_putc(apr_bucket_brigade *b,
- apr_brigade_flush flush, void *ctx,
- const char c)
-{
- return apr_brigade_write(b, flush, ctx, &c, 1);
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_write(apr_bucket_brigade *b,
- apr_brigade_flush flush,
- void *ctx,
- const char *str, apr_size_t nbyte)
-{
- apr_bucket *e = APR_BRIGADE_LAST(b);
- apr_size_t remaining = APR_BUCKET_BUFF_SIZE;
- char *buf = NULL;
-
- /*
- * If the last bucket is a heap bucket and its buffer is not shared with
- * another bucket, we may write into that bucket.
- */
- if (!APR_BRIGADE_EMPTY(b) && APR_BUCKET_IS_HEAP(e)
- && ((apr_bucket_heap *)(e->data))->refcount.refcount == 1) {
- apr_bucket_heap *h = e->data;
-
- /* HEAP bucket start offsets are always in-memory, safe to cast */
- remaining = h->alloc_len - (e->length + (apr_size_t)e->start);
- buf = h->base + e->start + e->length;
- }
-
- if (nbyte > remaining) {
- /* either a buffer bucket exists but is full,
- * or no buffer bucket exists and the data is too big
- * to buffer. In either case, we should flush. */
- if (flush) {
- e = apr_bucket_transient_create(str, nbyte, b->bucket_alloc);
- APR_BRIGADE_INSERT_TAIL(b, e);
- return flush(b, ctx);
- }
- else {
- e = apr_bucket_heap_create(str, nbyte, NULL, b->bucket_alloc);
- APR_BRIGADE_INSERT_TAIL(b, e);
- return APR_SUCCESS;
- }
- }
- else if (!buf) {
- /* we don't have a buffer, but the data is small enough
- * that we don't mind making a new buffer */
- buf = apr_bucket_alloc(APR_BUCKET_BUFF_SIZE, b->bucket_alloc);
- e = apr_bucket_heap_create(buf, APR_BUCKET_BUFF_SIZE,
- apr_bucket_free, b->bucket_alloc);
- APR_BRIGADE_INSERT_TAIL(b, e);
- e->length = 0; /* We are writing into the brigade, and
- * allocating more memory than we need. This
- * ensures that the bucket thinks it is empty just
- * after we create it. We'll fix the length
- * once we put data in it below.
- */
- }
-
- /* there is a sufficiently big buffer bucket available now */
- memcpy(buf, str, nbyte);
- e->length += nbyte;
-
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_writev(apr_bucket_brigade *b,
- apr_brigade_flush flush,
- void *ctx,
- const struct iovec *vec,
- apr_size_t nvec)
-{
- apr_bucket *e;
- apr_size_t total_len;
- apr_size_t i;
- char *buf;
-
- /* Compute the total length of the data to be written.
- */
- total_len = 0;
- for (i = 0; i < nvec; i++) {
- total_len += vec[i].iov_len;
- }
-
- /* If the data to be written is very large, try to convert
- * the iovec to transient buckets rather than copying.
- */
- if (total_len > APR_BUCKET_BUFF_SIZE) {
- if (flush) {
- for (i = 0; i < nvec; i++) {
- e = apr_bucket_transient_create(vec[i].iov_base,
- vec[i].iov_len,
- b->bucket_alloc);
- APR_BRIGADE_INSERT_TAIL(b, e);
- }
- return flush(b, ctx);
- }
- else {
- for (i = 0; i < nvec; i++) {
- e = apr_bucket_heap_create((const char *) vec[i].iov_base,
- vec[i].iov_len, NULL,
- b->bucket_alloc);
- APR_BRIGADE_INSERT_TAIL(b, e);
- }
- return APR_SUCCESS;
- }
- }
-
- i = 0;
-
- /* If there is a heap bucket at the end of the brigade
- * already, and its refcount is 1, copy into the existing bucket.
- */
- e = APR_BRIGADE_LAST(b);
- if (!APR_BRIGADE_EMPTY(b) && APR_BUCKET_IS_HEAP(e)
- && ((apr_bucket_heap *)(e->data))->refcount.refcount == 1) {
- apr_bucket_heap *h = e->data;
- apr_size_t remaining = h->alloc_len -
- (e->length + (apr_size_t)e->start);
- buf = h->base + e->start + e->length;
-
- if (remaining >= total_len) {
- /* Simple case: all the data will fit in the
- * existing heap bucket
- */
- for (; i < nvec; i++) {
- apr_size_t len = vec[i].iov_len;
- memcpy(buf, (const void *) vec[i].iov_base, len);
- buf += len;
- }
- e->length += total_len;
- return APR_SUCCESS;
- }
- else {
- /* More complicated case: not all of the data
- * will fit in the existing heap bucket. The
- * total data size is <= APR_BUCKET_BUFF_SIZE,
- * so we'll need only one additional bucket.
- */
- const char *start_buf = buf;
- for (; i < nvec; i++) {
- apr_size_t len = vec[i].iov_len;
- if (len > remaining) {
- break;
- }
- memcpy(buf, (const void *) vec[i].iov_base, len);
- buf += len;
- remaining -= len;
- }
- e->length += (buf - start_buf);
- total_len -= (buf - start_buf);
-
- if (flush) {
- apr_status_t rv = flush(b, ctx);
- if (rv != APR_SUCCESS) {
- return rv;
- }
- }
-
- /* Now fall through into the case below to
- * allocate another heap bucket and copy the
- * rest of the array. (Note that i is not
- * reset to zero here; it holds the index
- * of the first vector element to be
- * written to the new bucket.)
- */
- }
- }
-
- /* Allocate a new heap bucket, and copy the data into it.
- * The checks above ensure that the amount of data to be
- * written here is no larger than APR_BUCKET_BUFF_SIZE.
- */
- buf = apr_bucket_alloc(APR_BUCKET_BUFF_SIZE, b->bucket_alloc);
- e = apr_bucket_heap_create(buf, APR_BUCKET_BUFF_SIZE,
- apr_bucket_free, b->bucket_alloc);
- for (; i < nvec; i++) {
- apr_size_t len = vec[i].iov_len;
- memcpy(buf, (const void *) vec[i].iov_base, len);
- buf += len;
- }
- e->length = total_len;
- APR_BRIGADE_INSERT_TAIL(b, e);
-
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_puts(apr_bucket_brigade *bb,
- apr_brigade_flush flush, void *ctx,
- const char *str)
-{
- return apr_brigade_write(bb, flush, ctx, str, strlen(str));
-}
-
-APU_DECLARE_NONSTD(apr_status_t) apr_brigade_putstrs(apr_bucket_brigade *b,
- apr_brigade_flush flush,
- void *ctx, ...)
-{
- va_list va;
- apr_status_t rv;
-
- va_start(va, ctx);
- rv = apr_brigade_vputstrs(b, flush, ctx, va);
- va_end(va);
- return rv;
-}
-
-APU_DECLARE_NONSTD(apr_status_t) apr_brigade_printf(apr_bucket_brigade *b,
- apr_brigade_flush flush,
- void *ctx,
- const char *fmt, ...)
-{
- va_list ap;
- apr_status_t rv;
-
- va_start(ap, fmt);
- rv = apr_brigade_vprintf(b, flush, ctx, fmt, ap);
- va_end(ap);
- return rv;
-}
-
-struct brigade_vprintf_data_t {
- apr_vformatter_buff_t vbuff;
-
- apr_bucket_brigade *b; /* associated brigade */
- apr_brigade_flush *flusher; /* flushing function */
- void *ctx;
-
- char *cbuff; /* buffer to flush from */
-};
-
-static apr_status_t brigade_flush(apr_vformatter_buff_t *buff)
-{
- /* callback function passed to ap_vformatter to be
- * called when vformatter needs to buff and
- * buff.curpos > buff.endpos
- */
-
- /* "downcast," have really passed a brigade_vprintf_data_t* */
- struct brigade_vprintf_data_t *vd = (struct brigade_vprintf_data_t*)buff;
- apr_status_t res = APR_SUCCESS;
-
- res = apr_brigade_write(vd->b, *vd->flusher, vd->ctx, vd->cbuff,
- APR_BUCKET_BUFF_SIZE);
-
- if(res != APR_SUCCESS) {
- return -1;
- }
-
- vd->vbuff.curpos = vd->cbuff;
- vd->vbuff.endpos = vd->cbuff + APR_BUCKET_BUFF_SIZE;
-
- return res;
-}
-
-APU_DECLARE(apr_status_t) apr_brigade_vprintf(apr_bucket_brigade *b,
- apr_brigade_flush flush,
- void *ctx,
- const char *fmt, va_list va)
-{
- /* the cast, in order of appearance */
- struct brigade_vprintf_data_t vd;
- char buf[APR_BUCKET_BUFF_SIZE];
- int written;
-
- vd.vbuff.curpos = buf;
- vd.vbuff.endpos = buf + APR_BUCKET_BUFF_SIZE;
- vd.b = b;
- vd.flusher = &flush;
- vd.ctx = ctx;
- vd.cbuff = buf;
-
- written = apr_vformatter(brigade_flush, &vd.vbuff, fmt, va);
-
- if (written == -1) {
- return -1;
- }
-
- /* write out what remains in the buffer */
- return apr_brigade_write(b, flush, ctx, buf, vd.vbuff.curpos - buf);
-}
-
-/* A "safe" maximum bucket size, 1Gb */
-#define MAX_BUCKET_SIZE (0x40000000)
-
-APU_DECLARE(apr_bucket *) apr_brigade_insert_file(apr_bucket_brigade *bb,
- apr_file_t *f,
- apr_off_t start,
- apr_off_t length,
- apr_pool_t *p)
-{
- apr_bucket *e;
-
- if (sizeof(apr_off_t) == sizeof(apr_size_t) || length < MAX_BUCKET_SIZE) {
- e = apr_bucket_file_create(f, start, (apr_size_t)length, p,
- bb->bucket_alloc);
- }
- else {
- /* Several buckets are needed. */
- e = apr_bucket_file_create(f, start, MAX_BUCKET_SIZE, p,
- bb->bucket_alloc);
-
- while (length > MAX_BUCKET_SIZE) {
- apr_bucket *ce;
- apr_bucket_copy(e, &ce);
- APR_BRIGADE_INSERT_TAIL(bb, ce);
- e->start += MAX_BUCKET_SIZE;
- length -= MAX_BUCKET_SIZE;
- }
- e->length = (apr_size_t)length; /* Resize just the last bucket */
- }
-
- APR_BRIGADE_INSERT_TAIL(bb, e);
- return e;
-}
diff --git a/contrib/apr-util/buckets/apr_buckets.c b/contrib/apr-util/buckets/apr_buckets.c
deleted file mode 100644
index 802f4e259694..000000000000
--- a/contrib/apr-util/buckets/apr_buckets.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_buckets.h"
-
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_setaside_noop(apr_bucket *data,
- apr_pool_t *pool)
-{
- return APR_SUCCESS;
-}
-
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_setaside_notimpl(apr_bucket *data,
- apr_pool_t *pool)
-{
- return APR_ENOTIMPL;
-}
-
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_split_notimpl(apr_bucket *data,
- apr_size_t point)
-{
- return APR_ENOTIMPL;
-}
-
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_copy_notimpl(apr_bucket *e,
- apr_bucket **c)
-{
- return APR_ENOTIMPL;
-}
-
-APU_DECLARE_NONSTD(void) apr_bucket_destroy_noop(void *data)
-{
- return;
-}
diff --git a/contrib/apr-util/buckets/apr_buckets_alloc.c b/contrib/apr-util/buckets/apr_buckets_alloc.c
deleted file mode 100644
index e5838dd016ec..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_alloc.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdlib.h>
-
-#include "apr_buckets.h"
-#include "apr_allocator.h"
-#include "apr_version.h"
-
-#define ALLOC_AMT (8192 - APR_MEMNODE_T_SIZE)
-
-typedef struct node_header_t {
- apr_size_t size;
- apr_bucket_alloc_t *alloc;
- apr_memnode_t *memnode;
- struct node_header_t *next;
-} node_header_t;
-
-#define SIZEOF_NODE_HEADER_T APR_ALIGN_DEFAULT(sizeof(node_header_t))
-#define SMALL_NODE_SIZE (APR_BUCKET_ALLOC_SIZE + SIZEOF_NODE_HEADER_T)
-
-/** A list of free memory from which new buckets or private bucket
- * structures can be allocated.
- */
-struct apr_bucket_alloc_t {
- apr_pool_t *pool;
- apr_allocator_t *allocator;
- node_header_t *freelist;
- apr_memnode_t *blocks;
-};
-
-static apr_status_t alloc_cleanup(void *data)
-{
- apr_bucket_alloc_t *list = data;
-
- apr_allocator_free(list->allocator, list->blocks);
-
-#if APR_POOL_DEBUG
- if (list->pool && list->allocator != apr_pool_allocator_get(list->pool)) {
- apr_allocator_destroy(list->allocator);
- }
-#endif
-
- return APR_SUCCESS;
-}
-
-APU_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create(apr_pool_t *p)
-{
- apr_allocator_t *allocator = apr_pool_allocator_get(p);
- apr_bucket_alloc_t *list;
-
-#if APR_POOL_DEBUG
- /* may be NULL for debug mode. */
- if (allocator == NULL) {
- if (apr_allocator_create(&allocator) != APR_SUCCESS) {
- apr_abortfunc_t fn = apr_pool_abort_get(p);
- if (fn)
- (fn)(APR_ENOMEM);
- abort();
- }
- }
-#endif
- list = apr_bucket_alloc_create_ex(allocator);
- if (list == NULL) {
- apr_abortfunc_t fn = apr_pool_abort_get(p);
- if (fn)
- (fn)(APR_ENOMEM);
- abort();
- }
- list->pool = p;
- apr_pool_cleanup_register(list->pool, list, alloc_cleanup,
- apr_pool_cleanup_null);
-
- return list;
-}
-
-APU_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create_ex(
- apr_allocator_t *allocator)
-{
- apr_bucket_alloc_t *list;
- apr_memnode_t *block;
-
- block = apr_allocator_alloc(allocator, ALLOC_AMT);
- if (!block) {
- return NULL;
- }
- list = (apr_bucket_alloc_t *)block->first_avail;
- list->pool = NULL;
- list->allocator = allocator;
- list->freelist = NULL;
- list->blocks = block;
- block->first_avail += APR_ALIGN_DEFAULT(sizeof(*list));
-
- return list;
-}
-
-APU_DECLARE_NONSTD(void) apr_bucket_alloc_destroy(apr_bucket_alloc_t *list)
-{
- if (list->pool) {
- apr_pool_cleanup_kill(list->pool, list, alloc_cleanup);
- }
-
- apr_allocator_free(list->allocator, list->blocks);
-
-#if APR_POOL_DEBUG
- if (list->pool && list->allocator != apr_pool_allocator_get(list->pool)) {
- apr_allocator_destroy(list->allocator);
- }
-#endif
-}
-
-APU_DECLARE_NONSTD(apr_size_t) apr_bucket_alloc_aligned_floor(apr_bucket_alloc_t *list,
- apr_size_t size)
-{
- if (size <= SMALL_NODE_SIZE) {
- size = SMALL_NODE_SIZE;
- }
- else {
-#if APR_VERSION_AT_LEAST(1,6,0)
- if (size < APR_MEMNODE_T_SIZE) {
- size = apr_allocator_align(list->allocator, 0);
- }
- else {
- size = apr_allocator_align(list->allocator,
- size - APR_MEMNODE_T_SIZE);
- }
-#else
- /* Assumes the minimum (default) allocator's boundary of 4K and
- * minimum (immutable before APR-1.6.x) allocation size of 8K,
- * hence possibly (yet unlikely) under-estimating the floor...
- */
- size = APR_ALIGN(size, 4096);
- if (size < 8192) {
- size = 8192;
- }
-#endif
- size -= APR_MEMNODE_T_SIZE;
- }
- size -= SIZEOF_NODE_HEADER_T;
- return size;
-}
-
-APU_DECLARE_NONSTD(void *) apr_bucket_alloc(apr_size_t size,
- apr_bucket_alloc_t *list)
-{
- node_header_t *node;
- apr_memnode_t *active = list->blocks;
- char *endp;
-
- size += SIZEOF_NODE_HEADER_T;
- if (size <= SMALL_NODE_SIZE) {
- if (list->freelist) {
- node = list->freelist;
- list->freelist = node->next;
- }
- else {
- endp = active->first_avail + SMALL_NODE_SIZE;
- if (endp >= active->endp) {
- list->blocks = apr_allocator_alloc(list->allocator, ALLOC_AMT);
- if (!list->blocks) {
- list->blocks = active;
- return NULL;
- }
- list->blocks->next = active;
- active = list->blocks;
- endp = active->first_avail + SMALL_NODE_SIZE;
- }
- node = (node_header_t *)active->first_avail;
- node->alloc = list;
- node->memnode = active;
- node->size = SMALL_NODE_SIZE;
- active->first_avail = endp;
- }
- }
- else {
- apr_memnode_t *memnode = apr_allocator_alloc(list->allocator, size);
- if (!memnode) {
- return NULL;
- }
- node = (node_header_t *)memnode->first_avail;
- node->alloc = list;
- node->memnode = memnode;
- node->size = size;
- }
- return ((char *)node) + SIZEOF_NODE_HEADER_T;
-}
-
-#ifdef APR_BUCKET_DEBUG
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-static void check_not_already_free(node_header_t *node)
-{
- apr_bucket_alloc_t *list = node->alloc;
- node_header_t *curr = list->freelist;
-
- while (curr) {
- if (node == curr) {
- abort();
- }
- curr = curr->next;
- }
-}
-#else
-#define check_not_already_free(node)
-#endif
-
-APU_DECLARE_NONSTD(void) apr_bucket_free(void *mem)
-{
- node_header_t *node = (node_header_t *)((char *)mem - SIZEOF_NODE_HEADER_T);
- apr_bucket_alloc_t *list = node->alloc;
-
- if (node->size == SMALL_NODE_SIZE) {
- check_not_already_free(node);
- node->next = list->freelist;
- list->freelist = node;
- }
- else {
- apr_allocator_free(list->allocator, node->memnode);
- }
-}
diff --git a/contrib/apr-util/buckets/apr_buckets_eos.c b/contrib/apr-util/buckets/apr_buckets_eos.c
deleted file mode 100644
index 25cff756252c..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_eos.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_buckets.h"
-
-static apr_status_t eos_bucket_read(apr_bucket *b, const char **str,
- apr_size_t *len, apr_read_type_e block)
-{
- *str = NULL;
- *len = 0;
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_eos_make(apr_bucket *b)
-{
- b->length = 0;
- b->start = 0;
- b->data = NULL;
- b->type = &apr_bucket_type_eos;
-
- return b;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_eos_create(apr_bucket_alloc_t *list)
-{
- apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
- APR_BUCKET_INIT(b);
- b->free = apr_bucket_free;
- b->list = list;
- return apr_bucket_eos_make(b);
-}
-
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_eos = {
- "EOS", 5, APR_BUCKET_METADATA,
- apr_bucket_destroy_noop,
- eos_bucket_read,
- apr_bucket_setaside_noop,
- apr_bucket_split_notimpl,
- apr_bucket_simple_copy
-};
diff --git a/contrib/apr-util/buckets/apr_buckets_file.c b/contrib/apr-util/buckets/apr_buckets_file.c
deleted file mode 100644
index 06b7cf0039f1..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_file.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_general.h"
-#include "apr_file_io.h"
-#include "apr_buckets.h"
-
-#if APR_HAS_MMAP
-#include "apr_mmap.h"
-
-/* mmap support for static files based on ideas from John Heidemann's
- * patch against 1.0.5. See
- * <http://www.isi.edu/~johnh/SOFTWARE/APACHE/index.html>.
- */
-
-#endif /* APR_HAS_MMAP */
-
-static void file_bucket_destroy(void *data)
-{
- apr_bucket_file *f = data;
-
- if (apr_bucket_shared_destroy(f)) {
- /* no need to close the file here; it will get
- * done automatically when the pool gets cleaned up */
- apr_bucket_free(f);
- }
-}
-
-#if APR_HAS_MMAP
-static int file_make_mmap(apr_bucket *e, apr_size_t filelength,
- apr_off_t fileoffset, apr_pool_t *p)
-{
- apr_bucket_file *a = e->data;
- apr_mmap_t *mm;
-
- if (!a->can_mmap) {
- return 0;
- }
-
- if (filelength > APR_MMAP_LIMIT) {
- if (apr_mmap_create(&mm, a->fd, fileoffset, APR_MMAP_LIMIT,
- APR_MMAP_READ, p) != APR_SUCCESS)
- {
- return 0;
- }
- apr_bucket_split(e, APR_MMAP_LIMIT);
- filelength = APR_MMAP_LIMIT;
- }
- else if ((filelength < APR_MMAP_THRESHOLD) ||
- (apr_mmap_create(&mm, a->fd, fileoffset, filelength,
- APR_MMAP_READ, p) != APR_SUCCESS))
- {
- return 0;
- }
- apr_bucket_mmap_make(e, mm, 0, filelength);
- file_bucket_destroy(a);
- return 1;
-}
-#endif
-
-static apr_status_t file_bucket_read(apr_bucket *e, const char **str,
- apr_size_t *len, apr_read_type_e block)
-{
- apr_bucket_file *a = e->data;
- apr_file_t *f = a->fd;
- apr_bucket *b = NULL;
- char *buf;
- apr_status_t rv;
- apr_size_t filelength = e->length; /* bytes remaining in file past offset */
- apr_off_t fileoffset = e->start;
-#if APR_HAS_THREADS && !APR_HAS_XTHREAD_FILES
- apr_int32_t flags;
-#endif
-
-#if APR_HAS_MMAP
- if (file_make_mmap(e, filelength, fileoffset, a->readpool)) {
- return apr_bucket_read(e, str, len, block);
- }
-#endif
-
-#if APR_HAS_THREADS && !APR_HAS_XTHREAD_FILES
- if ((flags = apr_file_flags_get(f)) & APR_FOPEN_XTHREAD) {
- /* this file descriptor is shared across multiple threads and
- * this OS doesn't support that natively, so as a workaround
- * we must reopen the file into a->readpool */
- const char *fname;
- apr_file_name_get(&fname, f);
-
- rv = apr_file_open(&f, fname, (flags & ~APR_FOPEN_XTHREAD), 0, a->readpool);
- if (rv != APR_SUCCESS)
- return rv;
-
- a->fd = f;
- }
-#endif
-
- *str = NULL; /* in case we die prematurely */
- *len = (filelength > a->read_size) ? a->read_size : filelength;
- buf = apr_bucket_alloc(*len, e->list);
-
- /* Handle offset ... */
- rv = apr_file_seek(f, APR_SET, &fileoffset);
- if (rv != APR_SUCCESS) {
- apr_bucket_free(buf);
- return rv;
- }
- rv = apr_file_read(f, buf, len);
- if (rv != APR_SUCCESS && rv != APR_EOF) {
- apr_bucket_free(buf);
- return rv;
- }
- filelength -= *len;
- /*
- * Change the current bucket to refer to what we read,
- * even if we read nothing because we hit EOF.
- */
- apr_bucket_heap_make(e, buf, *len, apr_bucket_free);
-
- /* If we have more to read from the file, then create another bucket */
- if (filelength > 0 && rv != APR_EOF) {
- /* for efficiency, we can just build a new apr_bucket struct
- * to wrap around the existing file bucket */
- b = apr_bucket_alloc(sizeof(*b), e->list);
- b->start = fileoffset + (*len);
- b->length = filelength;
- b->data = a;
- b->type = &apr_bucket_type_file;
- b->free = apr_bucket_free;
- b->list = e->list;
- APR_BUCKET_INSERT_AFTER(e, b);
- }
- else {
- file_bucket_destroy(a);
- }
-
- *str = buf;
- return rv;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_file_make(apr_bucket *b, apr_file_t *fd,
- apr_off_t offset,
- apr_size_t len, apr_pool_t *p)
-{
- apr_bucket_file *f;
-
- f = apr_bucket_alloc(sizeof(*f), b->list);
- f->fd = fd;
- f->readpool = p;
-#if APR_HAS_MMAP
- f->can_mmap = 1;
-#endif
- f->read_size = APR_BUCKET_BUFF_SIZE;
-
- b = apr_bucket_shared_make(b, f, offset, len);
- b->type = &apr_bucket_type_file;
-
- return b;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_file_create(apr_file_t *fd,
- apr_off_t offset,
- apr_size_t len, apr_pool_t *p,
- apr_bucket_alloc_t *list)
-{
- apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
- APR_BUCKET_INIT(b);
- b->free = apr_bucket_free;
- b->list = list;
- return apr_bucket_file_make(b, fd, offset, len, p);
-}
-
-APU_DECLARE(apr_status_t) apr_bucket_file_enable_mmap(apr_bucket *e,
- int enabled)
-{
-#if APR_HAS_MMAP
- apr_bucket_file *a = e->data;
- a->can_mmap = enabled;
- return APR_SUCCESS;
-#else
- return APR_ENOTIMPL;
-#endif /* APR_HAS_MMAP */
-}
-
-APU_DECLARE(apr_status_t) apr_bucket_file_set_buf_size(apr_bucket *e,
- apr_size_t size)
-{
- apr_bucket_file *a = e->data;
-
- if (size <= APR_BUCKET_BUFF_SIZE) {
- a->read_size = APR_BUCKET_BUFF_SIZE;
- }
- else {
- apr_size_t floor = apr_bucket_alloc_aligned_floor(e->list, size);
- a->read_size = (size < floor) ? size : floor;
- }
-
- return APR_SUCCESS;
-}
-
-static apr_status_t file_bucket_setaside(apr_bucket *data, apr_pool_t *reqpool)
-{
- apr_bucket_file *a = data->data;
- apr_file_t *fd = NULL;
- apr_file_t *f = a->fd;
- apr_pool_t *curpool = apr_file_pool_get(f);
-
- if (apr_pool_is_ancestor(curpool, reqpool)) {
- return APR_SUCCESS;
- }
-
- if (!apr_pool_is_ancestor(a->readpool, reqpool)) {
- a->readpool = reqpool;
- }
-
- apr_file_setaside(&fd, f, reqpool);
- a->fd = fd;
- return APR_SUCCESS;
-}
-
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_file = {
- "FILE", 5, APR_BUCKET_DATA,
- file_bucket_destroy,
- file_bucket_read,
- file_bucket_setaside,
- apr_bucket_shared_split,
- apr_bucket_shared_copy
-};
diff --git a/contrib/apr-util/buckets/apr_buckets_flush.c b/contrib/apr-util/buckets/apr_buckets_flush.c
deleted file mode 100644
index a5d84d7551aa..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_flush.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_buckets.h"
-
-static apr_status_t flush_bucket_read(apr_bucket *b, const char **str,
- apr_size_t *len, apr_read_type_e block)
-{
- *str = NULL;
- *len = 0;
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_flush_make(apr_bucket *b)
-{
- b->length = 0;
- b->start = 0;
- b->data = NULL;
- b->type = &apr_bucket_type_flush;
-
- return b;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_flush_create(apr_bucket_alloc_t *list)
-{
- apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
- APR_BUCKET_INIT(b);
- b->free = apr_bucket_free;
- b->list = list;
- return apr_bucket_flush_make(b);
-}
-
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_flush = {
- "FLUSH", 5, APR_BUCKET_METADATA,
- apr_bucket_destroy_noop,
- flush_bucket_read,
- apr_bucket_setaside_noop,
- apr_bucket_split_notimpl,
- apr_bucket_simple_copy
-};
diff --git a/contrib/apr-util/buckets/apr_buckets_heap.c b/contrib/apr-util/buckets/apr_buckets_heap.c
deleted file mode 100644
index 00f9808b922e..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_heap.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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_buckets.h"
-#define APR_WANT_MEMFUNC
-#include "apr_want.h"
-
-static apr_status_t heap_bucket_read(apr_bucket *b, const char **str,
- apr_size_t *len, apr_read_type_e block)
-{
- apr_bucket_heap *h = b->data;
-
- *str = h->base + b->start;
- *len = b->length;
- return APR_SUCCESS;
-}
-
-static void heap_bucket_destroy(void *data)
-{
- apr_bucket_heap *h = data;
-
- if (apr_bucket_shared_destroy(h)) {
- (*h->free_func)(h->base);
- apr_bucket_free(h);
- }
-}
-
-/* Warning: if you change this function, be sure to
- * change apr_bucket_pool_make() too! */
-APU_DECLARE(apr_bucket *) apr_bucket_heap_make(apr_bucket *b, const char *buf,
- apr_size_t length,
- void (*free_func)(void *data))
-{
- apr_bucket_heap *h;
-
- h = apr_bucket_alloc(sizeof(*h), b->list);
-
- if (!free_func) {
- h->alloc_len = length;
- h->base = apr_bucket_alloc(h->alloc_len, b->list);
- if (h->base == NULL) {
- apr_bucket_free(h);
- return NULL;
- }
- h->free_func = apr_bucket_free;
- memcpy(h->base, buf, length);
- }
- else {
- /* XXX: we lose the const qualifier here which indicates
- * there's something screwy with the API...
- */
- h->base = (char *) buf;
- h->alloc_len = length;
- h->free_func = free_func;
- }
-
- b = apr_bucket_shared_make(b, h, 0, length);
- b->type = &apr_bucket_type_heap;
-
- return b;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_heap_create(const char *buf,
- apr_size_t length,
- void (*free_func)(void *data),
- apr_bucket_alloc_t *list)
-{
- apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
- APR_BUCKET_INIT(b);
- b->free = apr_bucket_free;
- b->list = list;
- return apr_bucket_heap_make(b, buf, length, free_func);
-}
-
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_heap = {
- "HEAP", 5, APR_BUCKET_DATA,
- heap_bucket_destroy,
- heap_bucket_read,
- apr_bucket_setaside_noop,
- apr_bucket_shared_split,
- apr_bucket_shared_copy
-};
diff --git a/contrib/apr-util/buckets/apr_buckets_mmap.c b/contrib/apr-util/buckets/apr_buckets_mmap.c
deleted file mode 100644
index 19de291b5332..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_mmap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_buckets.h"
-
-#if APR_HAS_MMAP
-
-static apr_status_t mmap_bucket_read(apr_bucket *b, const char **str,
- apr_size_t *length, apr_read_type_e block)
-{
- apr_bucket_mmap *m = b->data;
- apr_status_t ok;
- void *addr;
-
- if (!m->mmap) {
- /* the apr_mmap_t was already cleaned up out from under us */
- return APR_EINVAL;
- }
-
- ok = apr_mmap_offset(&addr, m->mmap, b->start);
- if (ok != APR_SUCCESS) {
- return ok;
- }
- *str = addr;
- *length = b->length;
- return APR_SUCCESS;
-}
-
-static apr_status_t mmap_bucket_cleanup(void *data)
-{
- /* the apr_mmap_t is about to disappear out from under us, so we
- * have no choice but to pretend it doesn't exist anymore. the
- * refcount is now useless because there's nothing to refer to
- * anymore. so the only valid action on any remaining referrer
- * is to delete it. no more reads, no more anything. */
- apr_bucket_mmap *m = data;
-
- m->mmap = NULL;
- return APR_SUCCESS;
-}
-
-static void mmap_bucket_destroy(void *data)
-{
- apr_bucket_mmap *m = data;
-
- if (apr_bucket_shared_destroy(m)) {
- if (m->mmap) {
- apr_pool_cleanup_kill(m->mmap->cntxt, m, mmap_bucket_cleanup);
- apr_mmap_delete(m->mmap);
- }
- apr_bucket_free(m);
- }
-}
-
-/*
- * XXX: are the start and length arguments useful?
- */
-APU_DECLARE(apr_bucket *) apr_bucket_mmap_make(apr_bucket *b, apr_mmap_t *mm,
- apr_off_t start,
- apr_size_t length)
-{
- apr_bucket_mmap *m;
-
- m = apr_bucket_alloc(sizeof(*m), b->list);
- m->mmap = mm;
-
- apr_pool_cleanup_register(mm->cntxt, m, mmap_bucket_cleanup,
- apr_pool_cleanup_null);
-
- b = apr_bucket_shared_make(b, m, start, length);
- b->type = &apr_bucket_type_mmap;
-
- return b;
-}
-
-
-APU_DECLARE(apr_bucket *) apr_bucket_mmap_create(apr_mmap_t *mm,
- apr_off_t start,
- apr_size_t length,
- apr_bucket_alloc_t *list)
-{
- apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
- APR_BUCKET_INIT(b);
- b->free = apr_bucket_free;
- b->list = list;
- return apr_bucket_mmap_make(b, mm, start, length);
-}
-
-static apr_status_t mmap_bucket_setaside(apr_bucket *b, apr_pool_t *p)
-{
- apr_bucket_mmap *m = b->data;
- apr_mmap_t *mm = m->mmap;
- apr_mmap_t *new_mm;
- apr_status_t ok;
-
- if (!mm) {
- /* the apr_mmap_t was already cleaned up out from under us */
- return APR_EINVAL;
- }
-
- /* shortcut if possible */
- if (apr_pool_is_ancestor(mm->cntxt, p)) {
- return APR_SUCCESS;
- }
-
- /* duplicate apr_mmap_t into new pool */
- ok = apr_mmap_dup(&new_mm, mm, p);
- if (ok != APR_SUCCESS) {
- return ok;
- }
-
- /* decrement refcount on old apr_bucket_mmap */
- mmap_bucket_destroy(m);
-
- /* create new apr_bucket_mmap pointing to new apr_mmap_t */
- apr_bucket_mmap_make(b, new_mm, b->start, b->length);
-
- return APR_SUCCESS;
-}
-
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_mmap = {
- "MMAP", 5, APR_BUCKET_DATA,
- mmap_bucket_destroy,
- mmap_bucket_read,
- mmap_bucket_setaside,
- apr_bucket_shared_split,
- apr_bucket_shared_copy
-};
-
-#endif
diff --git a/contrib/apr-util/buckets/apr_buckets_pipe.c b/contrib/apr-util/buckets/apr_buckets_pipe.c
deleted file mode 100644
index 46b469705d6b..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_pipe.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_buckets.h"
-
-static apr_status_t pipe_bucket_read(apr_bucket *a, const char **str,
- apr_size_t *len, apr_read_type_e block)
-{
- apr_file_t *p = a->data;
- char *buf;
- apr_status_t rv;
- apr_interval_time_t timeout;
-
- if (block == APR_NONBLOCK_READ) {
- apr_file_pipe_timeout_get(p, &timeout);
- apr_file_pipe_timeout_set(p, 0);
- }
-
- *str = NULL;
- *len = APR_BUCKET_BUFF_SIZE;
- buf = apr_bucket_alloc(*len, a->list); /* XXX: check for failure? */
-
- rv = apr_file_read(p, buf, len);
-
- if (block == APR_NONBLOCK_READ) {
- apr_file_pipe_timeout_set(p, timeout);
- }
-
- if (rv != APR_SUCCESS && rv != APR_EOF) {
- apr_bucket_free(buf);
- return rv;
- }
- /*
- * If there's more to read we have to keep the rest of the pipe
- * for later. Otherwise, we'll close the pipe.
- * XXX: Note that more complicated bucket types that
- * refer to data not in memory and must therefore have a read()
- * function similar to this one should be wary of copying this
- * code because if they have a destroy function they probably
- * want to migrate the bucket's subordinate structure from the
- * old bucket to a raw new one and adjust it as appropriate,
- * rather than destroying the old one and creating a completely
- * new bucket.
- */
- if (*len > 0) {
- apr_bucket_heap *h;
- /* Change the current bucket to refer to what we read */
- a = apr_bucket_heap_make(a, buf, *len, apr_bucket_free);
- h = a->data;
- h->alloc_len = APR_BUCKET_BUFF_SIZE; /* note the real buffer size */
- *str = buf;
- APR_BUCKET_INSERT_AFTER(a, apr_bucket_pipe_create(p, a->list));
- }
- else {
- apr_bucket_free(buf);
- a = apr_bucket_immortal_make(a, "", 0);
- *str = a->data;
- if (rv == APR_EOF) {
- apr_file_close(p);
- }
- }
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_pipe_make(apr_bucket *b, apr_file_t *p)
-{
- /*
- * A pipe is closed when the end is reached in pipe_bucket_read(). If
- * the pipe isn't read to the end (e.g., error path), the pipe will be
- * closed when its pool goes away.
- *
- * Note that typically the pipe is allocated from the request pool
- * so it will disappear when the request is finished. However the
- * core filter may decide to set aside the tail end of a CGI
- * response if the connection is pipelined. This turns out not to
- * be a problem because the core will have read to the end of the
- * stream so the bucket(s) that it sets aside will be the heap
- * buckets created by pipe_bucket_read() above.
- */
- b->type = &apr_bucket_type_pipe;
- b->length = (apr_size_t)(-1);
- b->start = -1;
- b->data = p;
-
- return b;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_pipe_create(apr_file_t *p,
- apr_bucket_alloc_t *list)
-{
- apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
- APR_BUCKET_INIT(b);
- b->free = apr_bucket_free;
- b->list = list;
- return apr_bucket_pipe_make(b, p);
-}
-
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pipe = {
- "PIPE", 5, APR_BUCKET_DATA,
- apr_bucket_destroy_noop,
- pipe_bucket_read,
- apr_bucket_setaside_notimpl,
- apr_bucket_split_notimpl,
- apr_bucket_copy_notimpl
-};
diff --git a/contrib/apr-util/buckets/apr_buckets_pool.c b/contrib/apr-util/buckets/apr_buckets_pool.c
deleted file mode 100644
index 56ba585e0588..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_pool.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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_buckets.h"
-#define APR_WANT_MEMFUNC
-#include "apr_want.h"
-
-static apr_status_t pool_bucket_cleanup(void *data)
-{
- apr_bucket_pool *p = data;
-
- /*
- * If the pool gets cleaned up, we have to copy the data out
- * of the pool and onto the heap. But the apr_buckets out there
- * that point to this pool bucket need to be notified such that
- * they can morph themselves into a regular heap bucket the next
- * time they try to read. To avoid having to manipulate
- * reference counts and b->data pointers, the apr_bucket_pool
- * actually _contains_ an apr_bucket_heap as its first element,
- * so the two share their apr_bucket_refcount member, and you
- * can typecast a pool bucket struct to make it look like a
- * regular old heap bucket struct.
- */
- p->heap.base = apr_bucket_alloc(p->heap.alloc_len, p->list);
- memcpy(p->heap.base, p->base, p->heap.alloc_len);
- p->base = NULL;
- p->pool = NULL;
-
- return APR_SUCCESS;
-}
-
-static apr_status_t pool_bucket_read(apr_bucket *b, const char **str,
- apr_size_t *len, apr_read_type_e block)
-{
- apr_bucket_pool *p = b->data;
- const char *base = p->base;
-
- if (p->pool == NULL) {
- /*
- * pool has been cleaned up... masquerade as a heap bucket from now
- * on. subsequent bucket operations will use the heap bucket code.
- */
- b->type = &apr_bucket_type_heap;
- base = p->heap.base;
- }
- *str = base + b->start;
- *len = b->length;
- return APR_SUCCESS;
-}
-
-static void pool_bucket_destroy(void *data)
-{
- apr_bucket_pool *p = data;
-
- /* If the pool is cleaned up before the last reference goes
- * away, the data is really now on the heap; heap_destroy() takes
- * over. free() in heap_destroy() thinks it's freeing
- * an apr_bucket_heap, when in reality it's freeing the whole
- * apr_bucket_pool for us.
- */
- if (p->pool) {
- /* the shared resource is still in the pool
- * because the pool has not been cleaned up yet
- */
- if (apr_bucket_shared_destroy(p)) {
- apr_pool_cleanup_kill(p->pool, p, pool_bucket_cleanup);
- apr_bucket_free(p);
- }
- }
- else {
- /* the shared resource is no longer in the pool, it's
- * on the heap, but this reference still thinks it's a pool
- * bucket. we should just go ahead and pass control to
- * heap_destroy() for it since it doesn't know any better.
- */
- apr_bucket_type_heap.destroy(p);
- }
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_pool_make(apr_bucket *b,
- const char *buf, apr_size_t length, apr_pool_t *pool)
-{
- apr_bucket_pool *p;
-
- p = apr_bucket_alloc(sizeof(*p), b->list);
-
- /* XXX: we lose the const qualifier here which indicates
- * there's something screwy with the API...
- */
- /* XXX: why is this? buf is const, p->base is const... what's
- * the problem? --jcw */
- p->base = (char *) buf;
- p->pool = pool;
- p->list = b->list;
-
- b = apr_bucket_shared_make(b, p, 0, length);
- b->type = &apr_bucket_type_pool;
-
- /* pre-initialize heap bucket member */
- p->heap.alloc_len = length;
- p->heap.base = NULL;
- p->heap.free_func = apr_bucket_free;
-
- apr_pool_cleanup_register(p->pool, p, pool_bucket_cleanup,
- apr_pool_cleanup_null);
- return b;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_pool_create(const char *buf,
- apr_size_t length,
- apr_pool_t *pool,
- apr_bucket_alloc_t *list)
-{
- apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
- APR_BUCKET_INIT(b);
- b->free = apr_bucket_free;
- b->list = list;
- return apr_bucket_pool_make(b, buf, length, pool);
-}
-
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pool = {
- "POOL", 5, APR_BUCKET_DATA,
- pool_bucket_destroy,
- pool_bucket_read,
- apr_bucket_setaside_noop, /* don't need to setaside thanks to the cleanup*/
- apr_bucket_shared_split,
- apr_bucket_shared_copy
-};
diff --git a/contrib/apr-util/buckets/apr_buckets_refcount.c b/contrib/apr-util/buckets/apr_buckets_refcount.c
deleted file mode 100644
index 0e765d94a2f5..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_refcount.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_buckets.h"
-
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_shared_split(apr_bucket *a,
- apr_size_t point)
-{
- apr_bucket_refcount *r = a->data;
- apr_status_t rv;
-
- if ((rv = apr_bucket_simple_split(a, point)) != APR_SUCCESS) {
- return rv;
- }
- r->refcount++;
-
- return APR_SUCCESS;
-}
-
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_shared_copy(apr_bucket *a,
- apr_bucket **b)
-{
- apr_bucket_refcount *r = a->data;
-
- apr_bucket_simple_copy(a, b);
- r->refcount++;
-
- return APR_SUCCESS;
-}
-
-APU_DECLARE(int) apr_bucket_shared_destroy(void *data)
-{
- apr_bucket_refcount *r = data;
- r->refcount--;
- return (r->refcount == 0);
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_shared_make(apr_bucket *b, void *data,
- apr_off_t start,
- apr_size_t length)
-{
- apr_bucket_refcount *r = data;
-
- b->data = r;
- b->start = start;
- b->length = length;
- /* caller initializes the type field */
- r->refcount = 1;
-
- return b;
-}
diff --git a/contrib/apr-util/buckets/apr_buckets_simple.c b/contrib/apr-util/buckets/apr_buckets_simple.c
deleted file mode 100644
index cef748be79d7..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_simple.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_buckets.h"
-
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_simple_copy(apr_bucket *a,
- apr_bucket **b)
-{
- *b = apr_bucket_alloc(sizeof(**b), a->list); /* XXX: check for failure? */
- **b = *a;
-
- return APR_SUCCESS;
-}
-
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_simple_split(apr_bucket *a,
- apr_size_t point)
-{
- apr_bucket *b;
-
- if (point > a->length) {
- return APR_EINVAL;
- }
-
- apr_bucket_simple_copy(a, &b);
-
- a->length = point;
- b->length -= point;
- b->start += point;
-
- APR_BUCKET_INSERT_AFTER(a, b);
-
- return APR_SUCCESS;
-}
-
-static apr_status_t simple_bucket_read(apr_bucket *b, const char **str,
- apr_size_t *len, apr_read_type_e block)
-{
- *str = (char *)b->data + b->start;
- *len = b->length;
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_immortal_make(apr_bucket *b,
- const char *buf,
- apr_size_t length)
-{
- b->data = (char *)buf;
- b->length = length;
- b->start = 0;
- b->type = &apr_bucket_type_immortal;
-
- return b;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_immortal_create(const char *buf,
- apr_size_t length,
- apr_bucket_alloc_t *list)
-{
- apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
- APR_BUCKET_INIT(b);
- b->free = apr_bucket_free;
- b->list = list;
- return apr_bucket_immortal_make(b, buf, length);
-}
-
-/*
- * XXX: This function could do with some tweaking to reduce memory
- * usage in various cases, e.g. share buffers in the heap between all
- * the buckets that are set aside, or even spool set-aside data to
- * disk if it gets too voluminous (but if it does then that's probably
- * a bug elsewhere). There should probably be a apr_brigade_setaside()
- * function that co-ordinates the action of all the bucket setaside
- * functions to improve memory efficiency.
- */
-static apr_status_t transient_bucket_setaside(apr_bucket *b, apr_pool_t *pool)
-{
- b = apr_bucket_heap_make(b, (char *)b->data + b->start, b->length, NULL);
- if (b == NULL) {
- return APR_ENOMEM;
- }
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_transient_make(apr_bucket *b,
- const char *buf,
- apr_size_t length)
-{
- b->data = (char *)buf;
- b->length = length;
- b->start = 0;
- b->type = &apr_bucket_type_transient;
- return b;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_transient_create(const char *buf,
- apr_size_t length,
- apr_bucket_alloc_t *list)
-{
- apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
- APR_BUCKET_INIT(b);
- b->free = apr_bucket_free;
- b->list = list;
- return apr_bucket_transient_make(b, buf, length);
-}
-
-const apr_bucket_type_t apr_bucket_type_immortal = {
- "IMMORTAL", 5, APR_BUCKET_DATA,
- apr_bucket_destroy_noop,
- simple_bucket_read,
- apr_bucket_setaside_noop,
- apr_bucket_simple_split,
- apr_bucket_simple_copy
-};
-
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_transient = {
- "TRANSIENT", 5, APR_BUCKET_DATA,
- apr_bucket_destroy_noop,
- simple_bucket_read,
- transient_bucket_setaside,
- apr_bucket_simple_split,
- apr_bucket_simple_copy
-};
diff --git a/contrib/apr-util/buckets/apr_buckets_socket.c b/contrib/apr-util/buckets/apr_buckets_socket.c
deleted file mode 100644
index 68eae43befd7..000000000000
--- a/contrib/apr-util/buckets/apr_buckets_socket.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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_buckets.h"
-
-static apr_status_t socket_bucket_read(apr_bucket *a, const char **str,
- apr_size_t *len, apr_read_type_e block)
-{
- apr_socket_t *p = a->data;
- char *buf;
- apr_status_t rv;
- apr_interval_time_t timeout;
-
- if (block == APR_NONBLOCK_READ) {
- apr_socket_timeout_get(p, &timeout);
- apr_socket_timeout_set(p, 0);
- }
-
- *str = NULL;
- *len = APR_BUCKET_BUFF_SIZE;
- buf = apr_bucket_alloc(*len, a->list); /* XXX: check for failure? */
-
- rv = apr_socket_recv(p, buf, len);
-
- if (block == APR_NONBLOCK_READ) {
- apr_socket_timeout_set(p, timeout);
- }
-
- if (rv != APR_SUCCESS && rv != APR_EOF) {
- apr_bucket_free(buf);
- return rv;
- }
- /*
- * If there's more to read we have to keep the rest of the socket
- * for later. XXX: Note that more complicated bucket types that
- * refer to data not in memory and must therefore have a read()
- * function similar to this one should be wary of copying this
- * code because if they have a destroy function they probably
- * want to migrate the bucket's subordinate structure from the
- * old bucket to a raw new one and adjust it as appropriate,
- * rather than destroying the old one and creating a completely
- * new bucket.
- *
- * Even if there is nothing more to read, don't close the socket here
- * as we have to use it to send any response :) We could shut it
- * down for reading, but there is no benefit to doing so.
- */
- if (*len > 0) {
- apr_bucket_heap *h;
- /* Change the current bucket to refer to what we read */
- a = apr_bucket_heap_make(a, buf, *len, apr_bucket_free);
- h = a->data;
- h->alloc_len = APR_BUCKET_BUFF_SIZE; /* note the real buffer size */
- *str = buf;
- APR_BUCKET_INSERT_AFTER(a, apr_bucket_socket_create(p, a->list));
- }
- else {
- apr_bucket_free(buf);
- a = apr_bucket_immortal_make(a, "", 0);
- *str = a->data;
- }
- return APR_SUCCESS;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_socket_make(apr_bucket *b, apr_socket_t *p)
-{
- /*
- * XXX: We rely on a cleanup on some pool or other to actually
- * destroy the socket. We should probably explicitly call apr to
- * destroy it instead.
- *
- * Note that typically the socket is allocated from the connection pool
- * so it will disappear when the connection is finished.
- */
- b->type = &apr_bucket_type_socket;
- b->length = (apr_size_t)(-1);
- b->start = -1;
- b->data = p;
-
- return b;
-}
-
-APU_DECLARE(apr_bucket *) apr_bucket_socket_create(apr_socket_t *p,
- apr_bucket_alloc_t *list)
-{
- apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-
- APR_BUCKET_INIT(b);
- b->free = apr_bucket_free;
- b->list = list;
- return apr_bucket_socket_make(b, p);
-}
-
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_socket = {
- "SOCKET", 5, APR_BUCKET_DATA,
- apr_bucket_destroy_noop,
- socket_bucket_read,
- apr_bucket_setaside_notimpl,
- apr_bucket_split_notimpl,
- apr_bucket_copy_notimpl
-};
diff --git a/contrib/apr-util/build-outputs.mk b/contrib/apr-util/build-outputs.mk
deleted file mode 100644
index f6042d6b8ce1..000000000000
--- a/contrib/apr-util/build-outputs.mk
+++ /dev/null
@@ -1,152 +0,0 @@
-# DO NOT EDIT. AUTOMATICALLY GENERATED.
-
-buckets/apr_brigade.lo: buckets/apr_brigade.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets.lo: buckets/apr_buckets.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_alloc.lo: buckets/apr_buckets_alloc.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_eos.lo: buckets/apr_buckets_eos.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_file.lo: buckets/apr_buckets_file.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_flush.lo: buckets/apr_buckets_flush.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_heap.lo: buckets/apr_buckets_heap.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_mmap.lo: buckets/apr_buckets_mmap.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_pipe.lo: buckets/apr_buckets_pipe.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_pool.lo: buckets/apr_buckets_pool.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_refcount.lo: buckets/apr_buckets_refcount.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_simple.lo: buckets/apr_buckets_simple.c .make.dirs include/apr_buckets.h
-buckets/apr_buckets_socket.lo: buckets/apr_buckets_socket.c .make.dirs include/apr_buckets.h
-crypto/apr_crypto.lo: crypto/apr_crypto.c .make.dirs include/apr_crypto.h include/apu_errno.h include/apu_version.h include/private/apr_crypto_internal.h include/private/apu_internal.h
-crypto/apr_md4.lo: crypto/apr_md4.c .make.dirs include/apr_md4.h include/apr_xlate.h
-crypto/apr_md5.lo: crypto/apr_md5.c .make.dirs include/apr_md5.h include/apr_xlate.h
-crypto/apr_passwd.lo: crypto/apr_passwd.c .make.dirs include/apr_md5.h include/apr_sha1.h include/apr_xlate.h
-crypto/apr_sha1.lo: crypto/apr_sha1.c .make.dirs include/apr_base64.h include/apr_sha1.h include/apr_xlate.h
-crypto/apr_siphash.lo: crypto/apr_siphash.c .make.dirs include/apr_siphash.h
-crypto/crypt_blowfish.lo: crypto/crypt_blowfish.c .make.dirs
-crypto/getuuid.lo: crypto/getuuid.c .make.dirs include/apr_md5.h include/apr_uuid.h include/apr_xlate.h
-crypto/uuid.lo: crypto/uuid.c .make.dirs include/apr_uuid.h
-dbd/apr_dbd.lo: dbd/apr_dbd.c .make.dirs include/apr_dbd.h include/apu_version.h include/private/apr_dbd_internal.h include/private/apu_internal.h
-dbm/apr_dbm.lo: dbm/apr_dbm.c .make.dirs include/apr_dbm.h include/apu_version.h include/private/apr_dbm_private.h include/private/apu_internal.h
-dbm/apr_dbm_sdbm.lo: dbm/apr_dbm_sdbm.c .make.dirs include/apr_dbm.h include/apr_sdbm.h include/private/apr_dbm_private.h
-dbm/sdbm/sdbm.lo: dbm/sdbm/sdbm.c .make.dirs include/apr_sdbm.h
-dbm/sdbm/sdbm_hash.lo: dbm/sdbm/sdbm_hash.c .make.dirs include/apr_sdbm.h
-dbm/sdbm/sdbm_lock.lo: dbm/sdbm/sdbm_lock.c .make.dirs include/apr_sdbm.h
-dbm/sdbm/sdbm_pair.lo: dbm/sdbm/sdbm_pair.c .make.dirs include/apr_sdbm.h
-encoding/apr_base64.lo: encoding/apr_base64.c .make.dirs include/apr_base64.h include/apr_xlate.h
-hooks/apr_hooks.lo: hooks/apr_hooks.c .make.dirs include/apr_hooks.h include/apr_optional.h include/apr_optional_hooks.h
-ldap/apr_ldap_stub.lo: ldap/apr_ldap_stub.c .make.dirs include/apu_version.h include/private/apu_internal.h
-ldap/apr_ldap_url.lo: ldap/apr_ldap_url.c .make.dirs
-memcache/apr_memcache.lo: memcache/apr_memcache.c .make.dirs include/apr_buckets.h include/apr_memcache.h include/apr_reslist.h
-misc/apr_date.lo: misc/apr_date.c .make.dirs include/apr_date.h
-misc/apr_queue.lo: misc/apr_queue.c .make.dirs include/apr_queue.h
-misc/apr_reslist.lo: misc/apr_reslist.c .make.dirs include/apr_reslist.h
-misc/apr_rmm.lo: misc/apr_rmm.c .make.dirs include/apr_anylock.h include/apr_rmm.h
-misc/apr_thread_pool.lo: misc/apr_thread_pool.c .make.dirs include/apr_thread_pool.h
-misc/apu_dso.lo: misc/apu_dso.c .make.dirs include/apu_version.h include/private/apu_internal.h
-misc/apu_version.lo: misc/apu_version.c .make.dirs include/apu_version.h
-redis/apr_redis.lo: redis/apr_redis.c .make.dirs include/apr_buckets.h include/apr_redis.h include/apr_reslist.h
-strmatch/apr_strmatch.lo: strmatch/apr_strmatch.c .make.dirs include/apr_strmatch.h
-uri/apr_uri.lo: uri/apr_uri.c .make.dirs include/apr_uri.h
-xlate/xlate.lo: xlate/xlate.c .make.dirs include/apr_xlate.h
-xml/apr_xml.lo: xml/apr_xml.c .make.dirs include/apr_xlate.h include/apr_xml.h
-
-OBJECTS_all = buckets/apr_brigade.lo buckets/apr_buckets.lo buckets/apr_buckets_alloc.lo buckets/apr_buckets_eos.lo buckets/apr_buckets_file.lo buckets/apr_buckets_flush.lo buckets/apr_buckets_heap.lo buckets/apr_buckets_mmap.lo buckets/apr_buckets_pipe.lo buckets/apr_buckets_pool.lo buckets/apr_buckets_refcount.lo buckets/apr_buckets_simple.lo buckets/apr_buckets_socket.lo crypto/apr_crypto.lo crypto/apr_md4.lo crypto/apr_md5.lo crypto/apr_passwd.lo crypto/apr_sha1.lo crypto/apr_siphash.lo crypto/crypt_blowfish.lo crypto/getuuid.lo crypto/uuid.lo dbd/apr_dbd.lo dbm/apr_dbm.lo dbm/apr_dbm_sdbm.lo dbm/sdbm/sdbm.lo dbm/sdbm/sdbm_hash.lo dbm/sdbm/sdbm_lock.lo dbm/sdbm/sdbm_pair.lo encoding/apr_base64.lo hooks/apr_hooks.lo ldap/apr_ldap_stub.lo ldap/apr_ldap_url.lo memcache/apr_memcache.lo misc/apr_date.lo misc/apr_queue.lo misc/apr_reslist.lo misc/apr_rmm.lo misc/apr_thread_pool.lo misc/apu_dso.lo misc/apu_version.lo redis/apr_redis.lo strmatch/apr_strmatch.lo uri/apr_uri.lo xlate/xlate.lo xml/apr_xml.lo
-
-OBJECTS_unix = $(OBJECTS_all)
-
-OBJECTS_aix = $(OBJECTS_all)
-
-OBJECTS_beos = $(OBJECTS_all)
-
-OBJECTS_os2 = $(OBJECTS_all)
-
-OBJECTS_os390 = $(OBJECTS_all)
-
-OBJECTS_win32 = $(OBJECTS_all)
-
-HEADERS = $(top_srcdir)/include/apr_anylock.h $(top_srcdir)/include/apr_base64.h $(top_srcdir)/include/apr_buckets.h $(top_srcdir)/include/apr_crypto.h $(top_srcdir)/include/apr_date.h $(top_srcdir)/include/apr_dbd.h $(top_srcdir)/include/apr_dbm.h $(top_srcdir)/include/apr_hooks.h $(top_srcdir)/include/apr_ldap_init.h $(top_srcdir)/include/apr_ldap_option.h $(top_srcdir)/include/apr_ldap_rebind.h $(top_srcdir)/include/apr_ldap_url.h $(top_srcdir)/include/apr_md4.h $(top_srcdir)/include/apr_md5.h $(top_srcdir)/include/apr_memcache.h $(top_srcdir)/include/apr_optional.h $(top_srcdir)/include/apr_optional_hooks.h $(top_srcdir)/include/apr_queue.h $(top_srcdir)/include/apr_redis.h $(top_srcdir)/include/apr_reslist.h $(top_srcdir)/include/apr_rmm.h $(top_srcdir)/include/apr_sdbm.h $(top_srcdir)/include/apr_sha1.h $(top_srcdir)/include/apr_siphash.h $(top_srcdir)/include/apr_strmatch.h $(top_srcdir)/include/apr_thread_pool.h $(top_srcdir)/include/apr_uri.h $(top_srcdir)/include/apr_uuid.h $(top_srcdir)/include/apr_xlate.h $(top_srcdir)/include/apr_xml.h $(top_srcdir)/include/apu_errno.h $(top_srcdir)/include/apu_version.h $(top_srcdir)/include/private/apr_crypto_internal.h $(top_srcdir)/include/private/apr_dbd_internal.h $(top_srcdir)/include/private/apr_dbd_odbc_v2.h $(top_srcdir)/include/private/apr_dbm_private.h $(top_srcdir)/include/private/apu_internal.h
-
-SOURCE_DIRS = xml redis dbm encoding hooks buckets uri misc crypto dbd strmatch memcache dbm/sdbm ldap xlate $(EXTRA_SOURCE_DIRS)
-
-ldap/apr_ldap_init.lo: ldap/apr_ldap_init.c .make.dirs include/private/apu_internal.h
-ldap/apr_ldap_option.lo: ldap/apr_ldap_option.c .make.dirs
-ldap/apr_ldap_rebind.lo: ldap/apr_ldap_rebind.c .make.dirs include/apr_ldap_rebind.h
-OBJECTS_ldap = ldap/apr_ldap_init.lo ldap/apr_ldap_option.lo ldap/apr_ldap_rebind.lo
-MODULE_ldap = ldap/apr_ldap.la
-ldap/apr_ldap.la: ldap/apr_ldap_init.lo ldap/apr_ldap_option.lo ldap/apr_ldap_rebind.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_ldap) $(LDADD_ldap)
-
-crypto/apr_crypto_openssl.lo: crypto/apr_crypto_openssl.c .make.dirs include/apr_buckets.h include/apr_crypto.h include/apu_errno.h include/private/apr_crypto_internal.h
-OBJECTS_crypto_openssl = crypto/apr_crypto_openssl.lo
-MODULE_crypto_openssl = crypto/apr_crypto_openssl.la
-crypto/apr_crypto_openssl.la: crypto/apr_crypto_openssl.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_crypto_openssl) $(LDADD_crypto_openssl)
-
-crypto/apr_crypto_nss.lo: crypto/apr_crypto_nss.c .make.dirs include/apr_buckets.h include/apr_crypto.h include/apu_errno.h include/private/apr_crypto_internal.h
-OBJECTS_crypto_nss = crypto/apr_crypto_nss.lo
-MODULE_crypto_nss = crypto/apr_crypto_nss.la
-crypto/apr_crypto_nss.la: crypto/apr_crypto_nss.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_crypto_nss) $(LDADD_crypto_nss)
-
-crypto/apr_crypto_commoncrypto.lo: crypto/apr_crypto_commoncrypto.c .make.dirs include/apr_buckets.h include/apr_crypto.h include/apu_errno.h include/private/apr_crypto_internal.h
-OBJECTS_crypto_commoncrypto = crypto/apr_crypto_commoncrypto.lo
-MODULE_crypto_commoncrypto = crypto/apr_crypto_commoncrypto.la
-crypto/apr_crypto_commoncrypto.la: crypto/apr_crypto_commoncrypto.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_crypto_commoncrypto) $(LDADD_crypto_commoncrypto)
-
-dbd/apr_dbd_pgsql.lo: dbd/apr_dbd_pgsql.c .make.dirs include/apr_buckets.h include/apr_dbd.h include/private/apr_dbd_internal.h
-OBJECTS_dbd_pgsql = dbd/apr_dbd_pgsql.lo
-MODULE_dbd_pgsql = dbd/apr_dbd_pgsql.la
-dbd/apr_dbd_pgsql.la: dbd/apr_dbd_pgsql.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_dbd_pgsql) $(LDADD_dbd_pgsql)
-
-dbd/apr_dbd_sqlite2.lo: dbd/apr_dbd_sqlite2.c .make.dirs include/apr_buckets.h include/apr_dbd.h include/private/apr_dbd_internal.h
-OBJECTS_dbd_sqlite2 = dbd/apr_dbd_sqlite2.lo
-MODULE_dbd_sqlite2 = dbd/apr_dbd_sqlite2.la
-dbd/apr_dbd_sqlite2.la: dbd/apr_dbd_sqlite2.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_dbd_sqlite2) $(LDADD_dbd_sqlite2)
-
-dbd/apr_dbd_sqlite3.lo: dbd/apr_dbd_sqlite3.c .make.dirs include/apr_buckets.h include/apr_dbd.h include/private/apr_dbd_internal.h
-OBJECTS_dbd_sqlite3 = dbd/apr_dbd_sqlite3.lo
-MODULE_dbd_sqlite3 = dbd/apr_dbd_sqlite3.la
-dbd/apr_dbd_sqlite3.la: dbd/apr_dbd_sqlite3.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_dbd_sqlite3) $(LDADD_dbd_sqlite3)
-
-dbd/apr_dbd_oracle.lo: dbd/apr_dbd_oracle.c .make.dirs include/apr_buckets.h include/apr_dbd.h include/private/apr_dbd_internal.h
-OBJECTS_dbd_oracle = dbd/apr_dbd_oracle.lo
-MODULE_dbd_oracle = dbd/apr_dbd_oracle.la
-dbd/apr_dbd_oracle.la: dbd/apr_dbd_oracle.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_dbd_oracle) $(LDADD_dbd_oracle)
-
-dbd/apr_dbd_mysql.lo: dbd/apr_dbd_mysql.c .make.dirs include/apr_buckets.h include/apr_dbd.h include/apu_version.h include/private/apr_dbd_internal.h
-OBJECTS_dbd_mysql = dbd/apr_dbd_mysql.lo
-MODULE_dbd_mysql = dbd/apr_dbd_mysql.la
-dbd/apr_dbd_mysql.la: dbd/apr_dbd_mysql.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_dbd_mysql) $(LDADD_dbd_mysql)
-
-dbd/apr_dbd_odbc.lo: dbd/apr_dbd_odbc.c .make.dirs include/apr_buckets.h include/apr_dbd.h include/apu_version.h include/private/apr_dbd_internal.h include/private/apr_dbd_odbc_v2.h
-OBJECTS_dbd_odbc = dbd/apr_dbd_odbc.lo
-MODULE_dbd_odbc = dbd/apr_dbd_odbc.la
-dbd/apr_dbd_odbc.la: dbd/apr_dbd_odbc.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_dbd_odbc) $(LDADD_dbd_odbc)
-
-dbm/apr_dbm_berkeleydb.lo: dbm/apr_dbm_berkeleydb.c .make.dirs include/apr_dbm.h include/private/apr_dbm_private.h
-OBJECTS_dbm_db = dbm/apr_dbm_berkeleydb.lo
-MODULE_dbm_db = dbm/apr_dbm_db.la
-dbm/apr_dbm_db.la: dbm/apr_dbm_berkeleydb.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_dbm_db) $(LDADD_dbm_db)
-
-dbm/apr_dbm_gdbm.lo: dbm/apr_dbm_gdbm.c .make.dirs include/apr_dbm.h include/private/apr_dbm_private.h
-OBJECTS_dbm_gdbm = dbm/apr_dbm_gdbm.lo
-MODULE_dbm_gdbm = dbm/apr_dbm_gdbm.la
-dbm/apr_dbm_gdbm.la: dbm/apr_dbm_gdbm.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_dbm_gdbm) $(LDADD_dbm_gdbm)
-
-dbm/apr_dbm_ndbm.lo: dbm/apr_dbm_ndbm.c .make.dirs include/apr_dbm.h include/private/apr_dbm_private.h
-OBJECTS_dbm_ndbm = dbm/apr_dbm_ndbm.lo
-MODULE_dbm_ndbm = dbm/apr_dbm_ndbm.la
-dbm/apr_dbm_ndbm.la: dbm/apr_dbm_ndbm.lo
- $(LINK_MODULE) -o $@ $(OBJECTS_dbm_ndbm) $(LDADD_dbm_ndbm)
-
-BUILD_DIRS = buckets crypto dbd dbm dbm/sdbm encoding hooks ldap memcache misc redis strmatch uri xlate xml
-
-.make.dirs: $(srcdir)/build-outputs.mk
- @for d in $(BUILD_DIRS); do test -d $$d || mkdir $$d; done
- @echo timestamp > $@
diff --git a/contrib/apr-util/build.conf b/contrib/apr-util/build.conf
deleted file mode 100644
index 86e8c346df47..000000000000
--- a/contrib/apr-util/build.conf
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Configuration file for APRUTIL. Used by APR/build/gen-build.py
-#
-
-[options]
-
-# the platform-independent .c files
-paths =
- buckets/*.c
- crypto/apr_crypto.c
- crypto/apr_md4.c
- crypto/apr_md5.c
- crypto/apr_passwd.c
- crypto/apr_sha1.c
- crypto/apr_siphash.c
- crypto/getuuid.c
- crypto/uuid.c
- crypto/crypt_blowfish.c
- dbm/apr_dbm_sdbm.c
- dbm/apr_dbm.c
- dbm/sdbm/*.c
- encoding/*.c
- hooks/*.c
- ldap/apr_ldap_stub.c
- ldap/apr_ldap_url.c
- misc/*.c
- memcache/*.c
- redis/*.c
- uri/apr_uri.c
- xml/*.c
- strmatch/*.c
- xlate/*.c
- dbd/apr_dbd.c
-
-# we have no platform-specific subdirs
-platform_dirs =
-
-# the public headers
-headers = include/*.h include/private/*.h
-
-modules =
- ldap crypto_openssl crypto_nss crypto_commoncrypto dbd_pgsql
- dbd_sqlite2 dbd_sqlite3 dbd_oracle dbd_mysql dbd_odbc
- dbm_db dbm_gdbm dbm_ndbm
-
-# gen_uri_delim.c
-
-# we have a recursive makefile for the test files (for now)
-# test/*.c
-
-[crypto_commoncrypto]
-paths = crypto/apr_crypto_commoncrypto.c
-target = crypto/apr_crypto_commoncrypto.la
-
-[crypto_openssl]
-paths = crypto/apr_crypto_openssl.c
-target = crypto/apr_crypto_openssl.la
-
-[crypto_nss]
-paths = crypto/apr_crypto_nss.c
-target = crypto/apr_crypto_nss.la
-
-[dbd_pgsql]
-paths = dbd/apr_dbd_pgsql.c
-target = dbd/apr_dbd_pgsql.la
-
-[dbd_sqlite2]
-paths = dbd/apr_dbd_sqlite2.c
-target = dbd/apr_dbd_sqlite2.la
-
-[dbd_sqlite3]
-paths = dbd/apr_dbd_sqlite3.c
-target = dbd/apr_dbd_sqlite3.la
-
-[dbd_oracle]
-paths = dbd/apr_dbd_oracle.c
-target = dbd/apr_dbd_oracle.la
-
-[dbd_mysql]
-paths = dbd/apr_dbd_mysql.c
-target = dbd/apr_dbd_mysql.la
-
-[dbd_odbc]
-paths = dbd/apr_dbd_odbc.c
-target = dbd/apr_dbd_odbc.la
-
-[dbm_db]
-paths = dbm/apr_dbm_berkeleydb.c
-target = dbm/apr_dbm_db.la
-
-[dbm_gdbm]
-paths = dbm/apr_dbm_gdbm.c
-target = dbm/apr_dbm_gdbm.la
-
-[dbm_ndbm]
-paths = dbm/apr_dbm_ndbm.c
-target = dbm/apr_dbm_ndbm.la
-
-[ldap]
-paths = ldap/apr_ldap_init.c
- ldap/apr_ldap_option.c
- ldap/apr_ldap_rebind.c
-target = ldap/apr_ldap.la
-
diff --git a/contrib/apr-util/buildconf b/contrib/apr-util/buildconf
deleted file mode 100755
index 3abfe105f6ee..000000000000
--- a/contrib/apr-util/buildconf
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
- verbose="--verbose"
- shift
-fi
-
-# Default place to look for apr source. Can be overridden with
-# --with-apr=[directory]
-apr_src_dir=../apr
-
-while test $# -gt 0
-do
- # Normalize
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case "$1" in
- --with-apr=*)
- apr_src_dir=$optarg
- ;;
- esac
-
- shift
-done
-
-if [ -f "$apr_src_dir/build/apr_common.m4" ]; then
- apr_src_dir=`cd $apr_src_dir; pwd`
- echo ""
- echo "Looking for apr source in $apr_src_dir"
-else
- echo ""
- echo "Problem finding apr source in $apr_src_dir."
- echo "Use:"
- echo " --with-apr=[directory]"
- exit 1
-fi
-
-set -e
-
-# Remove some files, then copy them from apr source tree
-rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \
- build/config.guess build/config.sub build/get-version.sh
-cp -p $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
- $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \
- $apr_src_dir/build/config.sub $apr_src_dir/build/get-version.sh \
- build/
-
-# Remove aclocal.m4 as it'll break some builds...
-rm -rf aclocal.m4 autom4te*.cache
-
-#
-# Generate the autoconf header (include/apu_config.h) and ./configure
-#
-echo "Creating include/private/apu_config.h ..."
-${AUTOHEADER:-autoheader} $verbose
-
-echo "Creating configure ..."
-### do some work to toss config.cache?
-if ${AUTOCONF:-autoconf} $verbose; then
- :
-else
- echo "autoconf failed"
- exit 1
-fi
-
-#
-# Generate build-outputs.mk for the build system
-#
-echo "Generating 'make' outputs ..."
-$apr_src_dir/build/gen-build.py $verbose make
-
-# Remove autoconf cache again
-rm -rf autom4te*.cache
-
-# Create RPM Spec file
-if [ -f `which cut` ]; then
- echo rebuilding rpm spec file
- REVISION=`build/get-version.sh all include/apu_version.h APU`
- VERSION=`echo $REVISION | cut -d- -s -f1`
- RELEASE=`echo $REVISION | cut -d- -s -f2`
- if [ "x$VERSION" = "x" ]; then
- VERSION=$REVISION
- RELEASE=1
- fi
- sed -e "s/APU_VERSION/$VERSION/" -e "s/APU_RELEASE/$RELEASE/" \
- ./build/rpm/apr-util.spec.in > apr-util.spec
-fi
-
-# Verify the tree was clean, notify user if not (normal in development)
-#
-if [ -f "include/apu.h" -o -f "include/private/apu_config.h" -o \
- -f "include/apu_want.h" -o -f "include/private/apu_select_dbm.h" ]; then
- echo ""
- echo "Generated include files already exist, the tree is not clean."
- echo "The resulting build-outputs.mk file is incorrect"
-fi
-
-exit 0
diff --git a/contrib/apr-util/config.layout b/contrib/apr-util/config.layout
deleted file mode 100644
index 907d0bb11693..000000000000
--- a/contrib/apr-util/config.layout
+++ /dev/null
@@ -1,232 +0,0 @@
-##
-## config.layout -- Pre-defined Installation Path Layouts
-##
-## Hints:
-## - layouts can be loaded with configure's --enable-layout=ID option
-## - when no --enable-layout option is given, the default layout is `apr'
-## - a trailing plus character (`+') on paths is replaced with a
-## `/<target>' suffix where <target> is currently hardcoded to 'apr'.
-## (This may become a configurable parameter at some point.)
-##
-
-# Classical APR-util path layout designed for parallel installs.
-<Layout apr-util>
- prefix: /usr/local/apr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/modules
- mandir: ${prefix}/man
- sysconfdir: ${prefix}/conf
- datadir: ${prefix}
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
- localstatedir: ${prefix}
- libsuffix: -${APRUTIL_MAJOR_VERSION}
-</Layout>
-
-# Classical single-installation APR path layout.
-<Layout classic>
- prefix: /usr/local/apr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/modules
- mandir: ${prefix}/man
- sysconfdir: ${prefix}/conf
- datadir: ${prefix}
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include
- localstatedir: ${prefix}
-</Layout>
-
-# GNU standards conforming path layout.
-# See FSF's GNU project `make-stds' document for details.
-<Layout GNU>
- prefix: /usr/local
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec
- mandir: ${prefix}/man
- sysconfdir: ${prefix}/etc+
- datadir: ${prefix}/share+
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include+
- localstatedir: ${prefix}/var+
- runtimedir: ${localstatedir}/run
-</Layout>
-
-# Mac OS X Server (Rhapsody)
-<Layout Mac OS X Server>
- prefix: /Local/Library/WebServer
- exec_prefix: /usr
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: /System/Library/apr/Modules
- mandir: ${exec_prefix}/share/man
- sysconfdir: ${prefix}/Configuration
- datadir: ${prefix}
- installbuilddir: /System/Library/apr/Build
- includedir: /System/Library/Frameworks/apr.framework/Versions/2.0/Headers
- localstatedir: /var
- runtimedir: ${prefix}/Logs
-</Layout>
-
-# Darwin/Mac OS Layout
-<Layout Darwin>
- prefix: /usr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec+
- mandir: ${prefix}/share/man
- datadir: /Library/WebServer
- sysconfdir: /etc+
- installbuilddir: ${prefix}/share/httpd/build
- includedir: ${prefix}/include+
- localstatedir: /var
- runtimedir: ${localstatedir}/run
-</Layout>
-
-# Red Hat Linux 7.x layout
-<Layout RedHat>
- prefix: /usr
- exec_prefix: ${prefix}
- bindir: ${prefix}/bin
- sbindir: ${prefix}/sbin
- libdir: ${prefix}/lib
- libexecdir: ${prefix}/lib/apr
- mandir: ${prefix}/man
- sysconfdir: /etc/httpd/conf
- datadir: /var/www
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr
- localstatedir: /var
- runtimedir: ${localstatedir}/run
-</Layout>
-
-# According to the /opt filesystem conventions
-<Layout opt>
- prefix: /opt/apr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec
- mandir: ${prefix}/man
- sysconfdir: /etc${prefix}
- datadir: ${prefix}/share
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include
- localstatedir: /var${prefix}
- runtimedir: ${localstatedir}/run
-</Layout>
-
-# BeOS layout...
-<Layout beos>
- prefix: /boot/home/apr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec
- mandir: ${prefix}/man
- sysconfdir: ${prefix}/conf
- datadir: ${prefix}
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include
- localstatedir: ${prefix}
- runtimedir: ${localstatedir}/logs
-</Layout>
-
-# SuSE 6.x layout
-<Layout SuSE>
- prefix: /usr
- exec_prefix: ${prefix}
- bindir: ${prefix}/bin
- sbindir: ${prefix}/sbin
- libdir: ${prefix}/lib
- libexecdir: ${prefix}/lib/apr
- mandir: ${prefix}/share/man
- sysconfdir: /etc/httpd
- datadir: /usr/local/httpd
- installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr
- localstatedir: /var/lib/httpd
- runtimedir: /var/run
-</Layout>
-
-# BSD/OS layout
-<Layout BSDI>
- prefix: /var/www
- exec_prefix: /usr/contrib
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec/apr
- mandir: ${exec_prefix}/man
- sysconfdir: ${prefix}/conf
- datadir: ${prefix}
- installbuilddir: ${datadir}/build
- includedir: ${exec_prefix}/include/apr
- localstatedir: /var
- runtimedir: ${localstatedir}/run
-</Layout>
-
-# Solaris 8 Layout
-<Layout Solaris>
- prefix: /usr/apr
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec
- mandir: ${exec_prefix}/man
- sysconfdir: /etc/apr
- datadir: /var/apr
- installbuilddir: ${datadir}/build
- includedir: ${exec_prefix}/include
- localstatedir: ${prefix}
- runtimedir: /var/run
-</Layout>
-
-# OpenBSD Layout
-<Layout OpenBSD>
- prefix: /var/www
- exec_prefix: /usr
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/lib/apr/modules
- mandir: ${exec_prefix}/share/man
- sysconfdir: ${prefix}/conf
- datadir: ${prefix}
- installbuilddir: ${prefix}/build
- includedir: ${exec_prefix}/lib/apr/include
- localstatedir: ${prefix}
- runtimedir: ${prefix}/logs
-</Layout>
-
-# Debian layout
-<Layout Debian>
- prefix:
- exec_prefix: ${prefix}/usr
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/lib/apr/modules
- mandir: ${exec_prefix}/share/man
- datadir: ${exec_prefix}/share/apr
- includedir: ${exec_prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
- localstatedir: ${prefix}/var/run
- runtimedir: ${prefix}/var/run
- infodir: ${exec_prefix}/share/info
- libsuffix: -${APRUTIL_MAJOR_VERSION}
- installbuilddir: ${prefix}/usr/share/apache2/build
-</Layout>
diff --git a/contrib/apr-util/configure b/contrib/apr-util/configure
deleted file mode 100755
index 7a1f02696076..000000000000
--- a/contrib/apr-util/configure
+++ /dev/null
@@ -1,25340 +0,0 @@
-#! /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"
- 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'"
-
-
-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="export_vars.sh.in"
-# 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
-APRUTIL_LIBS
-APRUTIL_LDFLAGS
-APRUTIL_INCLUDES
-APRUTIL_PRIV_INCLUDES
-APRUTIL_EXPORT_LIBS
-EXTRA_OBJECTS
-APU_MODULES
-APU_DSO_LIBDIR
-APU_HAVE_MODULES
-APRUTIL_LIBNAME
-lib_target
-so_ext
-have_apr_iconv
-have_iconv
-apu_dbd_tests
-LDADD_dbd_odbc
-apu_have_odbc
-ODBC_CONFIG
-LDADD_dbd_oracle
-apu_have_oracle
-LDADD_dbd_sqlite2
-apu_have_sqlite2
-LDADD_dbd_sqlite3
-apu_have_sqlite3
-LDADD_dbd_mysql
-apu_have_mysql
-MYSQL_CONFIG
-LDADD_dbd_pgsql
-apu_have_pgsql
-PGSQL_CONFIG
-LDADD_dbm_ndbm
-LDADD_dbm_gdbm
-LDADD_dbm_db
-apu_db_version
-apu_db_header
-apu_have_db
-apu_have_ndbm
-apu_have_gdbm
-apu_have_sdbm
-apu_use_db
-apu_use_ndbm
-apu_use_gdbm
-apu_use_sdbm
-LDADD_ldap
-apu_has_ldap_other
-apu_has_ldap_zos
-apu_has_ldap_tivoli
-apu_has_ldap_mozilla
-apu_has_ldap_netscape
-apu_has_ldap_microsoft
-apu_has_ldap_novell
-apu_has_ldap_solaris
-apu_has_ldap_openldap
-apu_has_ldap
-apu_has_ldapssl_install_routines
-apu_has_ldap_sslinit
-apu_has_ldapssl_init
-apu_has_ldap_start_tls_s
-apu_has_ldapssl_add_trusted_cert
-apu_has_ldapssl_client_deinit
-apu_has_ldapssl_client_init
-ldap_ssl_h
-lber_h
-ldap_h
-LDADD_crypto_commoncrypto
-apu_have_commoncrypto
-LDADD_crypto_nss
-apu_have_nss
-PKG_CONFIG
-apu_have_crypto
-LDADD_crypto_openssl
-apu_have_openssl
-EGREP
-GREP
-CPP
-APR_ICONV_DIR
-apr_shlibpath_var
-APR_BUILD_DIR
-APR_LIBS
-APR_INCLUDES
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-APU_LTVERSION
-APRUTIL_MAJOR_VERSION
-APRUTIL_DOTTED_VERSION
-abs_builddir
-abs_srcdir
-top_builddir
-LT_NO_INSTALL
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-APU_CONFIG_LOCATION
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_layout
-with_apr
-with_apr_iconv
-with_crypto
-with_openssl
-with_nss
-with_commoncrypto
-with_lber
-with_ldap_include
-with_ldap_lib
-with_ldap
-with_dbm
-with_gdbm
-with_ndbm
-with_berkeley_db
-with_pgsql
-with_mysql
-with_sqlite3
-with_sqlite2
-with_oracle_include
-with_oracle
-with_odbc
-with_expat
-with_iconv
-enable_util_dso
-'
- ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
- case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) 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
- --disable-util-dso disable DSO build of modular components (crypto,
- dbd, dbm, ldap)
-
-Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-apr=PATH prefix for installed APR or the full path to
- apr-config
- --with-apr-iconv=DIR relative path to apr-iconv source
- --with-crypto enable crypto support
- --with-openssl=DIR specify location of OpenSSL
- --with-nss=DIR specify location of NSS
- --with-commoncrypto=DIR specify location of CommonCrypto
- --with-lber=library lber library to use
- --with-ldap-include=path path to ldap include files with trailing slash
- --with-ldap-lib=path path to ldap lib file
- --with-ldap=library ldap library to use
- --with-dbm=DBM choose the DBM type to use.
- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X}
- for some X=0,...,9
- --with-gdbm=DIR enable GDBM support
- --with-ndbm=PATH Find the NDBM header and library in `PATH/include'
- and `PATH/lib'. If PATH is of the form `HEADER:LIB',
- then search for header files in HEADER, and the
- library in LIB. If you omit the `=PATH' part
- completely, the configure script will search for
- NDBM in a number of standard places.
- --with-berkeley-db=PATH Find the Berkeley DB header and library in
- `PATH/include' and `PATH/lib'. If PATH is of the
- form `HEADER:LIB', then search for header files in
- HEADER, and the library in LIB. If you omit the
- `=PATH' part completely, the configure script will
- search for Berkeley DB in a number of standard
- places.
- --with-pgsql=DIR specify PostgreSQL location
- --with-mysql=DIR enable MySQL DBD driver
- --with-sqlite3=DIR enable sqlite3 DBD driver
- --with-sqlite2=DIR enable sqlite2 DBD driver
- --with-oracle-include=DIR
- path to Oracle include files
- --with-oracle=DIR enable Oracle DBD driver; giving ORACLE_HOME as DIR
- --with-odbc=DIR specify ODBC location
- --with-expat=DIR specify Expat location
- --with-iconv=DIR path to iconv installation
-
-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
-
-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_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_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_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_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
-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/private/apu_config.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.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 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
-
-
-
-abs_srcdir=`(cd $srcdir && pwd)`
-abs_builddir=`pwd`
-
-if test "$abs_builddir" != "$abs_srcdir"; then
- USE_VPATH=1
- APU_CONFIG_LOCATION=build
-else
- APU_CONFIG_LOCATION=source
-fi
-
-
-
-# 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}-
-
-
-# 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'
-
-
-# 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
-
-
-top_builddir="$abs_builddir"
-
-
-
-
-
- { $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="$abs_srcdir/build/mkdir.sh"
- fi
-
-
-get_version="$abs_srcdir/build/get-version.sh"
-version_hdr="$abs_srcdir/include/apu_version.h"
-APRUTIL_MAJOR_VERSION="`$get_version major $version_hdr APU`"
-APRUTIL_DOTTED_VERSION="`$get_version all $version_hdr APU`"
-
-APU_LTVERSION="-version-info `$get_version libtool $version_hdr APU`"
-
-
-
-
-
-echo "APR-util Version: ${APRUTIL_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-util"
-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=*)