diff options
| author | Joe Orton <jorton@apache.org> | 2009-03-24 16:30:56 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2009-03-24 16:30:56 +0000 |
| commit | 6f70ff7af962e2e433c468b1456637842d8bc0b8 (patch) | |
| tree | fa63fc8db36fc884579c345952c8e4210469d200 /dbm | |
| parent | 745348bfedacd8333ec89c5c43096e31bf05a0cf (diff) | |
| download | apr-6f70ff7af962e2e433c468b1456637842d8bc0b8.tar.gz | |
APR->APU conversion of DSO buildfoo; rename --disable-util-dso to
--disable-modular-dso:
* configure.in, Makefile.in: Use APR_DSO_MODULES for set of DSOs to
build.
* util-misc/apu_dso.c, include/private/apu_internal.h: Use macro
APR_HAVE_MODULAR_DSO to determine whether modular DSO build is used.
* build/dso.m4 (APR_MODULAR_DSO): Renamed from APU_CHECK_UTIL_DSO.
Define APR_HAVE_MODULAR_DSO if modular DSO biuld is used.
Add to LIBS not APRUTIL_LIBS. Rename configure flag to
--disable-modular-dso to disable modular DSO build.
* ldap/*.c, dbm/*.c, dbd/*.c, crypto/*.c: Adjust to use
APR_HAVE_MODULAR_DSO.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@757884 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbm')
| -rw-r--r-- | dbm/apr_dbm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dbm/apr_dbm.c b/dbm/apr_dbm.c index 613d0fe1a..8484fa0c1 100644 --- a/dbm/apr_dbm.c +++ b/dbm/apr_dbm.c @@ -56,7 +56,7 @@ #error a DBM implementation was not specified #endif -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO static apr_hash_t *drivers = NULL; @@ -71,13 +71,13 @@ static apr_status_t dbm_term(void *ptr) return APR_SUCCESS; } -#endif /* APU_DSO_BUILD */ +#endif /* APR_HAVE_MODULAR_DSO */ static apr_status_t dbm_open_type(apr_dbm_type_t const* * vtable, const char *type, apr_pool_t *pool) { -#if !APU_DSO_BUILD +#if !APR_HAVE_MODULAR_DSO *vtable = NULL; if (!strcasecmp(type, "default")) *vtable = &DBM_VTABLE; @@ -100,7 +100,7 @@ static apr_status_t dbm_open_type(apr_dbm_type_t const* * vtable, return APR_SUCCESS; return APR_ENOTIMPL; -#else /* APU_DSO_BUILD */ +#else /* APR_HAVE_MODULAR_DSO */ char modname[32]; char symname[34]; @@ -176,7 +176,7 @@ static apr_status_t dbm_open_type(apr_dbm_type_t const* * vtable, apu_dso_mutex_unlock(); return rv; -#endif /* APU_DSO_BUILD */ +#endif /* APR_HAVE_MODULAR_DSO */ } APU_DECLARE(apr_status_t) apr_dbm_open_ex(apr_dbm_t **pdb, const char *type, |