|
 |
0039045 |
--- apr-util-1.3.7/build/dso.m4.nodbmdso
|
|
|
0039045 |
+++ apr-util-1.3.7/build/dso.m4
|
|
 |
fd4048f |
@@ -44,6 +44,16 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
|
|
|
fd4048f |
fi
|
|
|
0039045 |
fi
|
|
|
0039045 |
|
|
|
0039045 |
+
|
|
|
0039045 |
+ ### Hack: force static linking of DBM code.
|
|
|
0039045 |
+ objs=
|
|
|
0039045 |
+ test $apu_have_db = 1 && objs="$objs dbm/apr_dbm_berkeleydb.lo"
|
|
|
0039045 |
+ test $apu_have_gdbm = 1 && objs="$objs dbm/apr_dbm_gdbm.lo"
|
|
|
0039045 |
+ test $apu_have_ndbm = 1 && objs="$objs dbm/apr_dbm_ndbm.lo"
|
|
|
0039045 |
+ EXTRA_OBJECTS="$EXTRA_OBJECTS $objs"
|
|
|
0039045 |
+ APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
|
|
|
0039045 |
+ APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
|
|
|
0039045 |
+
|
|
|
0039045 |
if test "$apu_dso_build" = "0"; then
|
|
|
0039045 |
|
|
|
0039045 |
# Statically link the drivers:
|
|
|
0039045 |
@@ -42,9 +65,6 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
|
|
|
0039045 |
test $apu_have_sqlite3 = 1 && objs="$objs dbd/apr_dbd_sqlite3.lo"
|
|
|
0039045 |
test $apu_have_freetds = 1 && objs="$objs dbd/apr_dbd_freetds.lo"
|
|
|
0039045 |
test $apu_have_odbc = 1 && objs="$objs dbd/apr_dbd_odbc.lo"
|
|
|
0039045 |
- test $apu_have_db = 1 && objs="$objs dbm/apr_dbm_berkeleydb.lo"
|
|
|
0039045 |
- test $apu_have_gdbm = 1 && objs="$objs dbm/apr_dbm_gdbm.lo"
|
|
|
0039045 |
- test $apu_have_ndbm = 1 && objs="$objs dbm/apr_dbm_ndbm.lo"
|
|
|
0039045 |
test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_init.lo"
|
|
|
0039045 |
test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_option.lo"
|
|
|
0039045 |
test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_rebind.lo"
|
|
|
f508ce4 |
@@ -81,11 +81,9 @@
|
|
|
0039045 |
|
|
|
f508ce4 |
APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_crypto_openssl $LDADD_crypto_nss"
|
|
|
0039045 |
APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_dbd_odbc"
|
|
|
0039045 |
- APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
|
|
|
0039045 |
APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_ldap"
|
|
|
f508ce4 |
APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_crypto_openssl $LDADD_crypto_nss"
|
|
|
0039045 |
APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_dbd_odbc"
|
|
|
0039045 |
- APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
|
|
|
0039045 |
APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_ldap"
|
|
|
0039045 |
|
|
|
0039045 |
else
|
|
|
0039045 |
@@ -82,9 +100,6 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
|
|
|
0039045 |
test $apu_have_sqlite3 = 1 && dsos="$dsos dbd/apr_dbd_sqlite3.la"
|
|
|
0039045 |
test $apu_have_freetds = 1 && dsos="$dsos dbd/apr_dbd_freetds.la"
|
|
|
0039045 |
test $apu_have_odbc = 1 && dsos="$dsos dbd/apr_dbd_odbc.la"
|
|
|
0039045 |
- test $apu_have_db = 1 && dsos="$dsos dbm/apr_dbm_db.la"
|
|
|
0039045 |
- test $apu_have_gdbm = 1 && dsos="$dsos dbm/apr_dbm_gdbm.la"
|
|
|
0039045 |
- test $apu_have_ndbm = 1 && dsos="$dsos dbm/apr_dbm_ndbm.la"
|
|
|
0039045 |
test $apu_has_ldap = 1 && dsos="$dsos ldap/apr_ldap.la"
|
|
|
0039045 |
|
|
|
0039045 |
if test -n "$dsos"; then
|
|
|
0039045 |
--- apr-util-1.3.7/dbm/apr_dbm.c.nodbmdso
|
|
|
0039045 |
+++ apr-util-1.3.7/dbm/apr_dbm.c
|
|
|
0039045 |
@@ -56,6 +56,9 @@
|
|
|
0039045 |
#error a DBM implementation was not specified
|
|
|
0039045 |
#endif
|
|
|
0039045 |
|
|
|
0039045 |
+#undef APU_DSO_BUILD
|
|
|
0039045 |
+#define APU_DSO_BUILD 0
|
|
|
0039045 |
+
|
|
|
0039045 |
#if APU_DSO_BUILD
|
|
|
0039045 |
|
|
|
0039045 |
static apr_hash_t *drivers = NULL;
|