Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 42259 invoked from network); 24 Mar 2009 16:31:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Mar 2009 16:31:38 -0000 Received: (qmail 40289 invoked by uid 500); 24 Mar 2009 16:31:38 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 40213 invoked by uid 500); 24 Mar 2009 16:31:37 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 40204 invoked by uid 99); 24 Mar 2009 16:31:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Mar 2009 16:31:37 +0000 X-ASF-Spam-Status: No, hits=-1996.5 required=10.0 tests=ALL_TRUSTED,URIBL_BLACK X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Mar 2009 16:31:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 918E423888A5; Tue, 24 Mar 2009 16:31:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r757884 - in /apr/apr/trunk: Makefile.in configure.in crypto/apr_crypto.c dbd/apr_dbd.c dbm/apr_dbm.c include/private/apu_internal.h ldap/apr_ldap_init.c ldap/apr_ldap_option.c ldap/apr_ldap_rebind.c ldap/apr_ldap_stub.c util-misc/apu_dso.c Date: Tue, 24 Mar 2009 16:31:01 -0000 To: commits@apr.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090324163111.918E423888A5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jorton Date: Tue Mar 24 16:30:56 2009 New Revision: 757884 URL: http://svn.apache.org/viewvc?rev=757884&view=rev Log: 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. Modified: apr/apr/trunk/Makefile.in apr/apr/trunk/configure.in apr/apr/trunk/crypto/apr_crypto.c apr/apr/trunk/dbd/apr_dbd.c apr/apr/trunk/dbm/apr_dbm.c apr/apr/trunk/include/private/apu_internal.h apr/apr/trunk/ldap/apr_ldap_init.c apr/apr/trunk/ldap/apr_ldap_option.c apr/apr/trunk/ldap/apr_ldap_rebind.c apr/apr/trunk/ldap/apr_ldap_stub.c apr/apr/trunk/util-misc/apu_dso.c Modified: apr/apr/trunk/Makefile.in URL: http://svn.apache.org/viewvc/apr/apr/trunk/Makefile.in?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/Makefile.in (original) +++ apr/apr/trunk/Makefile.in Tue Mar 24 16:30:56 2009 @@ -32,7 +32,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -APR_MODULES = @APR_MODULES@ +APR_DSO_MODULES = @APR_DSO_MODULES@ LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APR_DSO_LIBDIR) APR_DSO_LIBDIR = @APR_DSO_LIBDIR@ @@ -40,7 +40,7 @@ # Rules for building specific targets, starting with 'all' for # building the entire package. # -TARGETS = $(TARGET_LIB) $(APR_MODULES) \ +TARGETS = $(TARGET_LIB) $(APR_DSO_MODULES) \ apr.exp apr-config.out build/apr_rules.out LT_VERSION = @LT_VERSION@ @@ -120,9 +120,9 @@ install-modules-no: -install-modules-yes: $(APR_MODULES) +install-modules-yes: $(APR_DSO_MODULES) $(APR_MKDIR) $(DESTDIR)$(APR_DSO_LIBDIR) - @for m in $(APR_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APR_DSO_LIBDIR); done + @for m in $(APR_DSO_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APR_DSO_LIBDIR); done exports.c: $(HEADERS) $(APR_MKEXPORT) $(HEADERS) > $@ Modified: apr/apr/trunk/configure.in URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/configure.in (original) +++ apr/apr/trunk/configure.in Tue Mar 24 16:30:56 2009 @@ -2451,7 +2451,7 @@ fi dnl Enable DSO build; must be last: -APU_CHECK_UTIL_DSO +APR_MODULAR_DSO AC_SEARCH_LIBS(crypt, crypt ufc) AC_MSG_CHECKING(if system crypt() function is threadsafe) @@ -2485,7 +2485,7 @@ [Define to be absolute path to DSO directory]) AC_SUBST(APR_HAVE_MODULES) AC_SUBST(APR_DSO_LIBDIR) -AC_SUBST(APR_MODULES) +AC_SUBST(APR_DSO_MODULES) AC_SUBST(EXTRA_OBJECTS) dnl Modified: apr/apr/trunk/crypto/apr_crypto.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto.c?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/crypto/apr_crypto.c (original) +++ apr/apr/trunk/crypto/apr_crypto.c Tue Mar 24 16:30:56 2009 @@ -40,7 +40,7 @@ #define CLEANUP_CAST (apr_status_t (*)(void*)) -#if !APU_DSO_BUILD +#if !APR_HAVE_MODULAR_DSO #define DRIVER_LOAD(name,driver,pool,params) \ { \ extern const apr_crypto_driver_t driver; \ @@ -73,13 +73,13 @@ /* Top level pool scope, need process-scope lifetime */ for (parent = pool; parent; parent = apr_pool_parent_get(pool)) pool = parent; -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO /* deprecate in 2.0 - permit implicit initialization */ apu_dso_init(pool); #endif drivers = apr_hash_make(pool); -#if !APU_DSO_BUILD +#if !APR_HAVE_MODULAR_DSO /* Load statically-linked drivers: */ #if APU_HAVE_OPENSSL DRIVER_LOAD("openssl", apr_crypto_openssl_driver, pool, params); @@ -93,7 +93,7 @@ #if APU_HAVE_MSCNG DRIVER_LOAD("mscng", apr_crypto_mscng_driver, pool, params); #endif -#endif /* APU_DSO_BUILD */ +#endif /* APR_HAVE_MODULAR_DSO */ apr_pool_cleanup_register(pool, NULL, apr_crypto_term, apr_pool_cleanup_null); @@ -104,7 +104,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get_driver(apr_pool_t *pool, const char *name, const apr_crypto_driver_t **driver, const apr_array_header_t *params, const apu_err_t **result) { -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO char modname[32]; char symname[34]; apr_dso_handle_t *dso; @@ -113,7 +113,7 @@ apr_status_t rv; int rc = 0; -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO rv = apu_dso_mutex_lock(); if (rv) { return rv; @@ -121,13 +121,13 @@ #endif *driver = apr_hash_get(drivers, name, APR_HASH_KEY_STRING); if (*driver) { -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO apu_dso_mutex_unlock(); #endif return APR_SUCCESS; } -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO /* The driver DSO must have exactly the same lifetime as the * drivers hash table; ignore the passed-in pool */ pool = apr_hash_pool_get(drivers); Modified: apr/apr/trunk/dbd/apr_dbd.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd.c?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/dbd/apr_dbd.c (original) +++ apr/apr/trunk/dbd/apr_dbd.c Tue Mar 24 16:30:56 2009 @@ -63,7 +63,7 @@ } #endif -#if !APU_DSO_BUILD +#if !APR_HAVE_MODULAR_DSO #define DRIVER_LOAD(name,driver,pool) \ { \ extern const apr_dbd_driver_t driver; \ @@ -97,7 +97,7 @@ /* Top level pool scope, need process-scope lifetime */ for (parent = pool; parent; parent = apr_pool_parent_get(pool)) pool = parent; -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO /* deprecate in 2.0 - permit implicit initialization */ apu_dso_init(pool); #endif @@ -109,7 +109,7 @@ /* This already registers a pool cleanup */ #endif -#if !APU_DSO_BUILD +#if !APR_HAVE_MODULAR_DSO /* Load statically-linked drivers: */ #if APU_HAVE_MYSQL @@ -136,7 +136,7 @@ #if APU_HAVE_SOME_OTHER_BACKEND DRIVER_LOAD("firebird", apr_dbd_other_driver, pool); #endif -#endif /* APU_DSO_BUILD */ +#endif /* APR_HAVE_MODULAR_DSO */ apr_pool_cleanup_register(pool, NULL, apr_dbd_term, apr_pool_cleanup_null); @@ -147,14 +147,14 @@ APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name, const apr_dbd_driver_t **driver) { -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO char modname[32]; char symname[34]; apr_dso_handle_sym_t symbol; #endif apr_status_t rv; -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO rv = apu_dso_mutex_lock(); if (rv) { return rv; @@ -162,13 +162,13 @@ #endif *driver = apr_hash_get(drivers, name, APR_HASH_KEY_STRING); if (*driver) { -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO apu_dso_mutex_unlock(); #endif return APR_SUCCESS; } -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO /* The driver DSO must have exactly the same lifetime as the * drivers hash table; ignore the passed-in pool */ pool = apr_hash_pool_get(drivers); Modified: apr/apr/trunk/dbm/apr_dbm.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/apr_dbm.c?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/dbm/apr_dbm.c (original) +++ apr/apr/trunk/dbm/apr_dbm.c Tue Mar 24 16:30:56 2009 @@ -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 @@ 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 @@ 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 @@ 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, Modified: apr/apr/trunk/include/private/apu_internal.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/private/apu_internal.h?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/include/private/apu_internal.h (original) +++ apr/apr/trunk/include/private/apu_internal.h Tue Mar 24 16:30:56 2009 @@ -21,7 +21,7 @@ #ifndef APU_INTERNAL_H #define APU_INTERNAL_H -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO #ifdef __cplusplus extern "C" { @@ -67,7 +67,7 @@ } #endif -#endif /* APU_DSO_BUILD */ +#endif /* APR_HAVE_MODULAR_DSO */ #endif /* APU_INTERNAL_H */ Modified: apr/apr/trunk/ldap/apr_ldap_init.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_init.c?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/ldap/apr_ldap_init.c (original) +++ apr/apr/trunk/ldap/apr_ldap_init.c Tue Mar 24 16:30:56 2009 @@ -26,7 +26,7 @@ #include "apu.h" #include "apu_config.h" -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO #define APU_DSO_LDAP_BUILD #endif @@ -197,7 +197,7 @@ } -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO /* For DSO builds, export the table of entry points into the apr_ldap DSO * See include/private/apu_internal.h for the corresponding declarations @@ -214,6 +214,6 @@ apr_ldap_rebind_remove }; -#endif /* APU_DSO_BUILD */ +#endif /* APR_HAVE_MODULAR_DSO */ #endif /* APR_HAS_LDAP */ Modified: apr/apr/trunk/ldap/apr_ldap_option.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_option.c?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/ldap/apr_ldap_option.c (original) +++ apr/apr/trunk/ldap/apr_ldap_option.c Tue Mar 24 16:30:56 2009 @@ -25,7 +25,7 @@ #include "apu.h" #include "apu_config.h" -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO #define APU_DSO_LDAP_BUILD #endif Modified: apr/apr/trunk/ldap/apr_ldap_rebind.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_rebind.c?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/ldap/apr_ldap_rebind.c (original) +++ apr/apr/trunk/ldap/apr_ldap_rebind.c Tue Mar 24 16:30:56 2009 @@ -25,7 +25,7 @@ #include "apu.h" #include "apu_config.h" -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO #define APU_DSO_LDAP_BUILD #endif Modified: apr/apr/trunk/ldap/apr_ldap_stub.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_stub.c?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/ldap/apr_ldap_stub.c (original) +++ apr/apr/trunk/ldap/apr_ldap_stub.c Tue Mar 24 16:30:56 2009 @@ -27,7 +27,7 @@ #if APR_HAS_LDAP -#if APU_DSO_BUILD +#if APR_HAVE_MODULAR_DSO static struct apr__ldap_dso_fntable *lfn = NULL; @@ -139,7 +139,7 @@ return lfn->rebind_remove(ld); } -#endif /* APU_DSO_BUILD */ +#endif /* APR_HAVE_MODULAR_DSO */ #endif /* APR_HAS_LDAP */ Modified: apr/apr/trunk/util-misc/apu_dso.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apu_dso.c?rev=757884&r1=757883&r2=757884&view=diff ============================================================================== --- apr/apr/trunk/util-misc/apu_dso.c (original) +++ apr/apr/trunk/util-misc/apu_dso.c Tue Mar 24 16:30:56 2009 @@ -31,7 +31,7 @@ #include "apu_internal.h" #include "apu_version.h" -#if APR_DSO_BUILD +#if APR_HAVE_MODULAR_DSO #if APR_HAS_THREADS static apr_thread_mutex_t* mutex = NULL;