jorton 003904
--- apr-util-1.3.7/build/dso.m4.nodbmdso
jorton 003904
+++ apr-util-1.3.7/build/dso.m4
bojan fd4048
@@ -44,6 +44,16 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
bojan fd4048
      fi
jorton 003904
   fi
jorton 003904
 
jorton 003904
+
jorton 003904
+  ### Hack: force static linking of DBM code.
jorton 003904
+  objs=
jorton 003904
+  test $apu_have_db = 1 && objs="$objs dbm/apr_dbm_berkeleydb.lo"
jorton 003904
+  test $apu_have_gdbm = 1 && objs="$objs dbm/apr_dbm_gdbm.lo"
jorton 003904
+  test $apu_have_ndbm = 1 && objs="$objs dbm/apr_dbm_ndbm.lo"
jorton 003904
+  EXTRA_OBJECTS="$EXTRA_OBJECTS $objs"
jorton 003904
+  APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
jorton 003904
+  APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
jorton 003904
+
jorton 003904
   if test "$apu_dso_build" = "0"; then
jorton 003904
 
jorton 003904
      # Statically link the drivers:
jorton 003904
@@ -42,9 +65,6 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
jorton 003904
      test $apu_have_sqlite3 = 1 && objs="$objs dbd/apr_dbd_sqlite3.lo"
jorton 003904
      test $apu_have_freetds = 1 && objs="$objs dbd/apr_dbd_freetds.lo"
jorton 003904
      test $apu_have_odbc = 1 && objs="$objs dbd/apr_dbd_odbc.lo"
jorton 003904
-     test $apu_have_db = 1 && objs="$objs dbm/apr_dbm_berkeleydb.lo"
jorton 003904
-     test $apu_have_gdbm = 1 && objs="$objs dbm/apr_dbm_gdbm.lo"
jorton 003904
-     test $apu_have_ndbm = 1 && objs="$objs dbm/apr_dbm_ndbm.lo"
jorton 003904
      test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_init.lo"
jorton 003904
      test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_option.lo"
jorton 003904
      test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_rebind.lo"
jorton 003904
@@ -65,10 +85,8 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
jorton 003904
      fi
jorton 003904
 
jorton 003904
      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"
jorton 003904
-     APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
jorton 003904
      APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_ldap"
jorton 003904
      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"
jorton 003904
-     APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbm_db $LDADD_dbm_gdbm $LDADD_dbm_ndbm"
jorton 003904
      APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_ldap"
jorton 003904
 
jorton 003904
   else
jorton 003904
@@ -82,9 +100,6 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
jorton 003904
      test $apu_have_sqlite3 = 1 && dsos="$dsos dbd/apr_dbd_sqlite3.la"
jorton 003904
      test $apu_have_freetds = 1 && dsos="$dsos dbd/apr_dbd_freetds.la"
jorton 003904
      test $apu_have_odbc = 1 && dsos="$dsos dbd/apr_dbd_odbc.la"
jorton 003904
-     test $apu_have_db = 1 && dsos="$dsos dbm/apr_dbm_db.la"
jorton 003904
-     test $apu_have_gdbm = 1 && dsos="$dsos dbm/apr_dbm_gdbm.la"
jorton 003904
-     test $apu_have_ndbm = 1 && dsos="$dsos dbm/apr_dbm_ndbm.la"
jorton 003904
      test $apu_has_ldap = 1 && dsos="$dsos ldap/apr_ldap.la"
jorton 003904
 
jorton 003904
      if test -n "$dsos"; then
jorton 003904
--- apr-util-1.3.7/dbm/apr_dbm.c.nodbmdso
jorton 003904
+++ apr-util-1.3.7/dbm/apr_dbm.c
jorton 003904
@@ -56,6 +56,9 @@
jorton 003904
 #error a DBM implementation was not specified
jorton 003904
 #endif
jorton 003904
 
jorton 003904
+#undef APU_DSO_BUILD
jorton 003904
+#define APU_DSO_BUILD 0
jorton 003904
+
jorton 003904
 #if APU_DSO_BUILD
jorton 003904
 
jorton 003904
 static apr_hash_t *drivers = NULL;