Imported Upstream version 0.9.5aupstream

16 files changed, 933 insertions, 901 deletions

diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index d34e6e8..c6c27b3 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -19,9 +19,6 @@ endif
 if HAVE_SQLITE
   SQLITE_PLUGIN = libgnunet_plugin_datacache_sqlite.la
 endif
-if HAVE_MYSQL
-  MYSQL_PLUGIN = libgnunet_plugin_datacache_mysql.la
-endif
 if HAVE_POSTGRES
   POSTGRES_PLUGIN = libgnunet_plugin_datacache_postgres.la
 endif
@@ -42,8 +39,8 @@ libgnunetdatacache_la_LDFLAGS = \
 
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
-  $(MYSQL_PLUGIN) \
   $(POSTGRES_PLUGIN) \
+  libgnunet_plugin_datacache_heap.la \
   libgnunet_plugin_datacache_template.la 
 
 
@@ -51,21 +48,19 @@ libgnunet_plugin_datacache_sqlite_la_SOURCES = \
   plugin_datacache_sqlite.c
 libgnunet_plugin_datacache_sqlite_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  $(LTLIBINTL)
 libgnunet_plugin_datacache_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
-libgnunet_plugin_datacache_mysql_la_SOURCES = \
-  plugin_datacache_mysql.c
-libgnunet_plugin_datacache_mysql_la_LIBADD = \
+libgnunet_plugin_datacache_heap_la_SOURCES = \
+  plugin_datacache_heap.c
+libgnunet_plugin_datacache_heap_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/mysql/libgnunetmysql.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_PLUGIN_LDFLAGS) $(MYSQL_LDFLAGS) -lmysqlclient
-libgnunet_plugin_datacache_mysql_la_CPPFLAGS = \
- $(MYSQL_CPPFLAGS)
-libgnunet_plugin_datacache_mysql_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(MYSQL_LDFLAGS) -lmysqlclient
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
+libgnunet_plugin_datacache_heap_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_datacache_postgres_la_SOURCES = \
   plugin_datacache_postgres.c
@@ -82,7 +77,8 @@ libgnunet_plugin_datacache_postgres_la_LDFLAGS = \
 libgnunet_plugin_datacache_template_la_SOURCES = \
   plugin_datacache_template.c
 libgnunet_plugin_datacache_template_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS)
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
 libgnunet_plugin_datacache_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
@@ -98,16 +94,14 @@ SQLITE_TESTS = \
  $(SQLITE_BENCHMARKS)
 endif
 
-if HAVE_MYSQL
 if HAVE_BENCHMARKS
- MYSQL_BENCHMARKS = \
-  perf_datacache_mysql
-endif
-MYSQL_TESTS = \
- test_datacache_mysql \
- test_datacache_quota_mysql \
- $(MYSQL_BENCHMARKS)
+ HEAP_BENCHMARKS = \
+  perf_datacache_heap
 endif
+HEAP_TESTS = \
+ test_datacache_heap \
+ test_datacache_quota_heap \
+ $(HEAP_BENCHMARKS)
 
 if HAVE_POSTGRES
 if HAVE_BENCHMARKS
@@ -122,7 +116,7 @@ endif
 
 check_PROGRAMS = \
  $(SQLITE_TESTS) \
- $(MYSQL_TESTS) \
+ $(HEAP_TESTS) \
  $(POSTGRES_TESTS) 
 
 if ENABLE_TEST_RUN
@@ -132,61 +126,70 @@ endif
 test_datacache_sqlite_SOURCES = \
  test_datacache.c
 test_datacache_sqlite_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datacache_quota_sqlite_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_sqlite_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_datacache_sqlite_SOURCES = \
  perf_datacache.c
 perf_datacache_sqlite_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_datacache_mysql_SOURCES = \
+test_datacache_heap_SOURCES = \
  test_datacache.c
-test_datacache_mysql_LDADD = \
+test_datacache_heap_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_datacache_quota_mysql_SOURCES = \
+test_datacache_quota_heap_SOURCES = \
  test_datacache_quota.c
-test_datacache_quota_mysql_LDADD = \
+test_datacache_quota_heap_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-perf_datacache_mysql_SOURCES = \
+perf_datacache_heap_SOURCES = \
  perf_datacache.c
-perf_datacache_mysql_LDADD = \
+perf_datacache_heap_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datacache_postgres_SOURCES = \
  test_datacache.c
 test_datacache_postgres_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datacache_quota_postgres_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_postgres_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_datacache_postgres_SOURCES = \
  perf_datacache.c
 perf_datacache_postgres_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \
  test_datacache_data_sqlite.conf \
  perf_datacache_data_sqlite.conf \
- test_datacache_data_mysql.conf \
- perf_datacache_data_mysql.conf \
+ test_datacache_data_heap.conf \
+ perf_datacache_data_heap.conf \
  test_datacache_data_postgres.conf \
  perf_datacache_data_postgres.conf
diff --git a/src/datacache/Makefile.in b/src/datacache/Makefile.in
index 2acd972..a564d52 100644
--- a/src/datacache/Makefile.in
+++ b/src/datacache/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,14 +60,15 @@ DIST_COMMON = $(dist_pkgcfg_DATA) $(srcdir)/Makefile.am \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \
 	$(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/argz.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \
-	$(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/libunistring.m4 $(top_srcdir)/m4/ltdl.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libunistring.m4 \
+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -80,29 +98,31 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" \
 	"$(DESTDIR)$(pkgcfgdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(plugin_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libgnunet_plugin_datacache_mysql_la_DEPENDENCIES =  \
+libgnunet_plugin_datacache_heap_la_DEPENDENCIES =  \
 	$(top_builddir)/src/statistics/libgnunetstatistics.la \
-	$(top_builddir)/src/mysql/libgnunetmysql.la \
 	$(top_builddir)/src/util/libgnunetutil.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_libgnunet_plugin_datacache_mysql_la_OBJECTS =  \
-	libgnunet_plugin_datacache_mysql_la-plugin_datacache_mysql.lo
-libgnunet_plugin_datacache_mysql_la_OBJECTS =  \
-	$(am_libgnunet_plugin_datacache_mysql_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am_libgnunet_plugin_datacache_heap_la_OBJECTS =  \
+	plugin_datacache_heap.lo
+libgnunet_plugin_datacache_heap_la_OBJECTS =  \
+	$(am_libgnunet_plugin_datacache_heap_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
-libgnunet_plugin_datacache_mysql_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+libgnunet_plugin_datacache_heap_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libgnunet_plugin_datacache_mysql_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
-@HAVE_MYSQL_TRUE@am_libgnunet_plugin_datacache_mysql_la_rpath =  \
-@HAVE_MYSQL_TRUE@	-rpath $(plugindir)
+	$(libgnunet_plugin_datacache_heap_la_LDFLAGS) $(LDFLAGS) -o $@
 libgnunet_plugin_datacache_postgres_la_DEPENDENCIES =  \
 	$(top_builddir)/src/postgres/libgnunetpostgres.la \
 	$(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -121,7 +141,7 @@ libgnunet_plugin_datacache_postgres_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 libgnunet_plugin_datacache_sqlite_la_DEPENDENCIES =  \
 	$(top_builddir)/src/statistics/libgnunetstatistics.la \
 	$(top_builddir)/src/util/libgnunetutil.la \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libgnunet_plugin_datacache_sqlite_la_OBJECTS =  \
 	plugin_datacache_sqlite.lo
 libgnunet_plugin_datacache_sqlite_la_OBJECTS =  \
@@ -135,7 +155,7 @@ libgnunet_plugin_datacache_sqlite_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 @HAVE_SQLITE_TRUE@	-rpath $(plugindir)
 libgnunet_plugin_datacache_template_la_DEPENDENCIES =  \
 	$(top_builddir)/src/util/libgnunetutil.la \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libgnunet_plugin_datacache_template_la_OBJECTS =  \
 	plugin_datacache_template.lo
 libgnunet_plugin_datacache_template_la_OBJECTS =  \
@@ -159,46 +179,50 @@ libgnunetdatacache_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_SQLITE_TRUE@am__EXEEXT_2 = test_datacache_sqlite$(EXEEXT) \
 @HAVE_SQLITE_TRUE@	test_datacache_quota_sqlite$(EXEEXT) \
 @HAVE_SQLITE_TRUE@	$(am__EXEEXT_1)
-@HAVE_BENCHMARKS_TRUE@@HAVE_MYSQL_TRUE@am__EXEEXT_3 = perf_datacache_mysql$(EXEEXT)
-@HAVE_MYSQL_TRUE@am__EXEEXT_4 = test_datacache_mysql$(EXEEXT) \
-@HAVE_MYSQL_TRUE@	test_datacache_quota_mysql$(EXEEXT) \
-@HAVE_MYSQL_TRUE@	$(am__EXEEXT_3)
+@HAVE_BENCHMARKS_TRUE@am__EXEEXT_3 = perf_datacache_heap$(EXEEXT)
+am__EXEEXT_4 = test_datacache_heap$(EXEEXT) \
+	test_datacache_quota_heap$(EXEEXT) $(am__EXEEXT_3)
 @HAVE_BENCHMARKS_TRUE@@HAVE_POSTGRES_TRUE@am__EXEEXT_5 = perf_datacache_postgres$(EXEEXT)
 @HAVE_POSTGRES_TRUE@am__EXEEXT_6 = test_datacache_postgres$(EXEEXT) \
 @HAVE_POSTGRES_TRUE@	test_datacache_quota_postgres$(EXEEXT) \
 @HAVE_POSTGRES_TRUE@	$(am__EXEEXT_5)
-am_perf_datacache_mysql_OBJECTS = perf_datacache.$(OBJEXT)
-perf_datacache_mysql_OBJECTS = $(am_perf_datacache_mysql_OBJECTS)
-perf_datacache_mysql_DEPENDENCIES =  \
+am_perf_datacache_heap_OBJECTS = perf_datacache.$(OBJEXT)
+perf_datacache_heap_OBJECTS = $(am_perf_datacache_heap_OBJECTS)
+perf_datacache_heap_DEPENDENCIES =  \
+	$(top_builddir)/src/testing/libgnunettesting.la \
 	$(top_builddir)/src/datacache/libgnunetdatacache.la \
 	$(top_builddir)/src/util/libgnunetutil.la
 am_perf_datacache_postgres_OBJECTS = perf_datacache.$(OBJEXT)
 perf_datacache_postgres_OBJECTS =  \
 	$(am_perf_datacache_postgres_OBJECTS)
 perf_datacache_postgres_DEPENDENCIES =  \
+	$(top_builddir)/src/testing/libgnunettesting.la \
 	$(top_builddir)/src/datacache/libgnunetdatacache.la \
 	$(top_builddir)/src/util/libgnunetutil.la
 am_perf_datacache_sqlite_OBJECTS = perf_datacache.$(OBJEXT)
 perf_datacache_sqlite_OBJECTS = $(am_perf_datacache_sqlite_OBJECTS)
 perf_datacache_sqlite_DEPENDENCIES =  \
+	$(top_builddir)/src/testing/libgnunettesting.la \
 	$(top_builddir)/src/datacache/libgnunetdatacache.la \
 	$(top_builddir)/src/util/libgnunetutil.la
-am_test_datacache_mysql_OBJECTS = test_datacache.$(OBJEXT)
-test_datacache_mysql_OBJECTS = $(am_test_datacache_mysql_OBJECTS)
-test_datacache_mysql_DEPENDENCIES =  \
+am_test_datacache_heap_OBJECTS = test_datacache.$(OBJEXT)
+test_datacache_heap_OBJECTS = $(am_test_datacache_heap_OBJECTS)
+test_datacache_heap_DEPENDENCIES =  \
+	$(top_builddir)/src/testing/libgnunettesting.la \
 	$(top_builddir)/src/datacache/libgnunetdatacache.la \
 	$(top_builddir)/src/util/libgnunetutil.la
 am_test_datacache_postgres_OBJECTS = test_datacache.$(OBJEXT)
 test_datacache_postgres_OBJECTS =  \
 	$(am_test_datacache_postgres_OBJECTS)
 test_datacache_postgres_DEPENDENCIES =  \
+	$(top_builddir)/src/testing/libgnunettesting.la \
 	$(top_builddir)/src/datacache/libgnunetdatacache.la \
 	$(top_builddir)/src/util/libgnunetutil.la
-am_test_datacache_quota_mysql_OBJECTS =  \
-	test_datacache_quota.$(OBJEXT)
-test_datacache_quota_mysql_OBJECTS =  \
-	$(am_test_datacache_quota_mysql_OBJECTS)
-test_datacache_quota_mysql_DEPENDENCIES =  \
+am_test_datacache_quota_heap_OBJECTS = test_datacache_quota.$(OBJEXT)
+test_datacache_quota_heap_OBJECTS =  \
+	$(am_test_datacache_quota_heap_OBJECTS)
+test_datacache_quota_heap_DEPENDENCIES =  \
+	$(top_builddir)/src/testing/libgnunettesting.la \
 	$(top_builddir)/src/datacache/libgnunetdatacache.la \
 	$(top_builddir)/src/util/libgnunetutil.la
 am_test_datacache_quota_postgres_OBJECTS =  \
@@ -206,6 +230,7 @@ am_test_datacache_quota_postgres_OBJECTS =  \
 test_datacache_quota_postgres_OBJECTS =  \
 	$(am_test_datacache_quota_postgres_OBJECTS)
 test_datacache_quota_postgres_DEPENDENCIES =  \
+	$(top_builddir)/src/testing/libgnunettesting.la \
 	$(top_builddir)/src/datacache/libgnunetdatacache.la \
 	$(top_builddir)/src/util/libgnunetutil.la
 am_test_datacache_quota_sqlite_OBJECTS =  \
@@ -213,11 +238,13 @@ am_test_datacache_quota_sqlite_OBJECTS =  \
 test_datacache_quota_sqlite_OBJECTS =  \
 	$(am_test_datacache_quota_sqlite_OBJECTS)
 test_datacache_quota_sqlite_DEPENDENCIES =  \
+	$(top_builddir)/src/testing/libgnunettesting.la \
 	$(top_builddir)/src/datacache/libgnunetdatacache.la \
 	$(top_builddir)/src/util/libgnunetutil.la
 am_test_datacache_sqlite_OBJECTS = test_datacache.$(OBJEXT)
 test_datacache_sqlite_OBJECTS = $(am_test_datacache_sqlite_OBJECTS)
 test_datacache_sqlite_DEPENDENCIES =  \
+	$(top_builddir)/src/testing/libgnunettesting.la \
 	$(top_builddir)/src/datacache/libgnunetdatacache.la \
 	$(top_builddir)/src/util/libgnunetutil.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -230,50 +257,55 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libgnunet_plugin_datacache_mysql_la_SOURCES) \
+SOURCES = $(libgnunet_plugin_datacache_heap_la_SOURCES) \
 	$(libgnunet_plugin_datacache_postgres_la_SOURCES) \
 	$(libgnunet_plugin_datacache_sqlite_la_SOURCES) \
 	$(libgnunet_plugin_datacache_template_la_SOURCES) \
 	$(libgnunetdatacache_la_SOURCES) \
-	$(perf_datacache_mysql_SOURCES) \
+	$(perf_datacache_heap_SOURCES) \
 	$(perf_datacache_postgres_SOURCES) \
 	$(perf_datacache_sqlite_SOURCES) \
-	$(test_datacache_mysql_SOURCES) \
+	$(test_datacache_heap_SOURCES) \
 	$(test_datacache_postgres_SOURCES) \
-	$(test_datacache_quota_mysql_SOURCES) \
+	$(test_datacache_quota_heap_SOURCES) \
 	$(test_datacache_quota_postgres_SOURCES) \
 	$(test_datacache_quota_sqlite_SOURCES) \
 	$(test_datacache_sqlite_SOURCES)
-DIST_SOURCES = $(libgnunet_plugin_datacache_mysql_la_SOURCES) \
+DIST_SOURCES = $(libgnunet_plugin_datacache_heap_la_SOURCES) \
 	$(libgnunet_plugin_datacache_postgres_la_SOURCES) \
 	$(libgnunet_plugin_datacache_sqlite_la_SOURCES) \
 	$(libgnunet_plugin_datacache_template_la_SOURCES) \
 	$(libgnunetdatacache_la_SOURCES) \
-	$(perf_datacache_mysql_SOURCES) \
+	$(perf_datacache_heap_SOURCES) \
 	$(perf_datacache_postgres_SOURCES) \
 	$(perf_datacache_sqlite_SOURCES) \
-	$(test_datacache_mysql_SOURCES) \
+	$(test_datacache_heap_SOURCES) \
 	$(test_datacache_postgres_SOURCES) \
-	$(test_datacache_quota_mysql_SOURCES) \
+	$(test_datacache_quota_heap_SOURCES) \
 	$(test_datacache_quota_postgres_SOURCES) \
 	$(test_datacache_quota_sqlite_SOURCES) \
 	$(test_datacache_sqlite_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(dist_pkgcfg_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -315,6 +347,10 @@ EXEEXT = @EXEEXT@
 EXT_LIBS = @EXT_LIBS@
 EXT_LIB_PATH = @EXT_LIB_PATH@
 FGREP = @FGREP@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUNETDNS_GROUP = @GNUNETDNS_GROUP@
@@ -325,6 +361,7 @@ GN_LIBINTL = @GN_LIBINTL@
 GN_LIB_LDFLAGS = @GN_LIB_LDFLAGS@
 GN_PLUGIN_LDFLAGS = @GN_PLUGIN_LDFLAGS@
 GN_USER_HOME_DIR = @GN_USER_HOME_DIR@
+GOBJECT_QUERY = @GOBJECT_QUERY@
 GREP = @GREP@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 INCLTDL = @INCLTDL@
@@ -347,6 +384,8 @@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@
+LIBGTOP_LIBS = @LIBGTOP_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBLTDL = @LIBLTDL@
@@ -368,6 +407,7 @@ LT_CONFIG_H = @LT_CONFIG_H@
 LT_DLLOADERS = @LT_DLLOADERS@
 LT_DLPREOPEN = @LT_DLPREOPEN@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONKEYPREFIX = @MONKEYPREFIX@
 MSGFMT = @MSGFMT@
@@ -377,6 +417,7 @@ MYSQL_CPPFLAGS = @MYSQL_CPPFLAGS@
 MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
 NM = @NM@
 NMEDIT = @NMEDIT@
+NSS_DIR = @NSS_DIR@
 OBJC = @OBJC@
 OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
@@ -392,6 +433,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
 POSTGRES_CPPFLAGS = @POSTGRES_CPPFLAGS@
 POSTGRES_LDFLAGS = @POSTGRES_LDFLAGS@
 POSUB = @POSUB@
@@ -423,6 +465,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -445,6 +488,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gitcommand = @gitcommand@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -458,7 +502,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 ltdl_LIBOBJS = @ltdl_LIBOBJS@
 ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
 mandir = @mandir@
@@ -476,6 +519,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 subdirs = @subdirs@
+svnversioncommand = @svnversioncommand@
 sys_symbol_underscore = @sys_symbol_underscore@
 sysconfdir = @sysconfdir@
 target = @target@
@@ -496,7 +540,6 @@ dist_pkgcfg_DATA = \
 @USE_COVERAGE_TRUE@AM_CFLAGS = --coverage -O0
 @USE_COVERAGE_TRUE@XLIBS = -lgcov
 @HAVE_SQLITE_TRUE@SQLITE_PLUGIN = libgnunet_plugin_datacache_sqlite.la
-@HAVE_MYSQL_TRUE@MYSQL_PLUGIN = libgnunet_plugin_datacache_mysql.la
 @HAVE_POSTGRES_TRUE@POSTGRES_PLUGIN = libgnunet_plugin_datacache_postgres.la
 lib_LTLIBRARIES = \
   libgnunetdatacache.la
@@ -515,8 +558,8 @@ libgnunetdatacache_la_LDFLAGS = \
 
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
-  $(MYSQL_PLUGIN) \
   $(POSTGRES_PLUGIN) \
+  libgnunet_plugin_datacache_heap.la \
   libgnunet_plugin_datacache_template.la 
 
 libgnunet_plugin_datacache_sqlite_la_SOURCES = \
@@ -524,25 +567,22 @@ libgnunet_plugin_datacache_sqlite_la_SOURCES = \
 
 libgnunet_plugin_datacache_sqlite_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  $(LTLIBINTL)
 
 libgnunet_plugin_datacache_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
-libgnunet_plugin_datacache_mysql_la_SOURCES = \
-  plugin_datacache_mysql.c
+libgnunet_plugin_datacache_heap_la_SOURCES = \
+  plugin_datacache_heap.c
 
-libgnunet_plugin_datacache_mysql_la_LIBADD = \
+libgnunet_plugin_datacache_heap_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/mysql/libgnunetmysql.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_PLUGIN_LDFLAGS) $(MYSQL_LDFLAGS) -lmysqlclient
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
 
-libgnunet_plugin_datacache_mysql_la_CPPFLAGS = \
- $(MYSQL_CPPFLAGS)
-
-libgnunet_plugin_datacache_mysql_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(MYSQL_LDFLAGS) -lmysqlclient
+libgnunet_plugin_datacache_heap_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_datacache_postgres_la_SOURCES = \
   plugin_datacache_postgres.c
@@ -563,7 +603,8 @@ libgnunet_plugin_datacache_template_la_SOURCES = \
   plugin_datacache_template.c
 
 libgnunet_plugin_datacache_template_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS)
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
 
 libgnunet_plugin_datacache_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -576,13 +617,13 @@ libgnunet_plugin_datacache_template_la_LDFLAGS = \
 @HAVE_SQLITE_TRUE@ test_datacache_quota_sqlite \
 @HAVE_SQLITE_TRUE@ $(SQLITE_BENCHMARKS)
 
-@HAVE_BENCHMARKS_TRUE@@HAVE_MYSQL_TRUE@MYSQL_BENCHMARKS = \
-@HAVE_BENCHMARKS_TRUE@@HAVE_MYSQL_TRUE@  perf_datacache_mysql
+@HAVE_BENCHMARKS_TRUE@HEAP_BENCHMARKS = \
+@HAVE_BENCHMARKS_TRUE@  perf_datacache_heap
 
-@HAVE_MYSQL_TRUE@MYSQL_TESTS = \
-@HAVE_MYSQL_TRUE@ test_datacache_mysql \
-@HAVE_MYSQL_TRUE@ test_datacache_quota_mysql \
-@HAVE_MYSQL_TRUE@ $(MYSQL_BENCHMARKS)
+HEAP_TESTS = \
+ test_datacache_heap \
+ test_datacache_quota_heap \
+ $(HEAP_BENCHMARKS)
 
 @HAVE_BENCHMARKS_TRUE@@HAVE_POSTGRES_TRUE@POSTGRES_BENCHMARKS = \
 @HAVE_BENCHMARKS_TRUE@@HAVE_POSTGRES_TRUE@  perf_datacache_postgres
@@ -597,6 +638,7 @@ test_datacache_sqlite_SOURCES = \
  test_datacache.c
 
 test_datacache_sqlite_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
@@ -604,6 +646,7 @@ test_datacache_quota_sqlite_SOURCES = \
  test_datacache_quota.c
 
 test_datacache_quota_sqlite_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
@@ -611,27 +654,31 @@ perf_datacache_sqlite_SOURCES = \
  perf_datacache.c
 
 perf_datacache_sqlite_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_datacache_mysql_SOURCES = \
+test_datacache_heap_SOURCES = \
  test_datacache.c
 
-test_datacache_mysql_LDADD = \
+test_datacache_heap_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_datacache_quota_mysql_SOURCES = \
+test_datacache_quota_heap_SOURCES = \
  test_datacache_quota.c
 
-test_datacache_quota_mysql_LDADD = \
+test_datacache_quota_heap_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-perf_datacache_mysql_SOURCES = \
+perf_datacache_heap_SOURCES = \
  perf_datacache.c
 
-perf_datacache_mysql_LDADD = \
+perf_datacache_heap_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
@@ -639,6 +686,7 @@ test_datacache_postgres_SOURCES = \
  test_datacache.c
 
 test_datacache_postgres_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
@@ -646,6 +694,7 @@ test_datacache_quota_postgres_SOURCES = \
  test_datacache_quota.c
 
 test_datacache_quota_postgres_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
@@ -653,14 +702,15 @@ perf_datacache_postgres_SOURCES = \
  perf_datacache.c
 
 perf_datacache_postgres_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \
  test_datacache_data_sqlite.conf \
  perf_datacache_data_sqlite.conf \
- test_datacache_data_mysql.conf \
- perf_datacache_data_mysql.conf \
+ test_datacache_data_heap.conf \
+ perf_datacache_data_heap.conf \
  test_datacache_data_postgres.conf \
  perf_datacache_data_postgres.conf
 
@@ -700,7 +750,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -708,6 +757,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -731,7 +782,6 @@ clean-libLTLIBRARIES:
 	done
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -739,6 +789,8 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -760,15 +812,15 @@ clean-pluginLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libgnunet_plugin_datacache_mysql.la: $(libgnunet_plugin_datacache_mysql_la_OBJECTS) $(libgnunet_plugin_datacache_mysql_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libgnunet_plugin_datacache_mysql_la_LINK) $(am_libgnunet_plugin_datacache_mysql_la_rpath) $(libgnunet_plugin_datacache_mysql_la_OBJECTS) $(libgnunet_plugin_datacache_mysql_la_LIBADD) $(LIBS)
-libgnunet_plugin_datacache_postgres.la: $(libgnunet_plugin_datacache_postgres_la_OBJECTS) $(libgnunet_plugin_datacache_postgres_la_DEPENDENCIES) 
+libgnunet_plugin_datacache_heap.la: $(libgnunet_plugin_datacache_heap_la_OBJECTS) $(libgnunet_plugin_datacache_heap_la_DEPENDENCIES) $(EXTRA_libgnunet_plugin_datacache_heap_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libgnunet_plugin_datacache_heap_la_LINK) -rpath $(plugindir) $(libgnunet_plugin_datacache_heap_la_OBJECTS) $(libgnunet_plugin_datacache_heap_la_LIBADD) $(LIBS)
+libgnunet_plugin_datacache_postgres.la: $(libgnunet_plugin_datacache_postgres_la_OBJECTS) $(libgnunet_plugin_datacache_postgres_la_DEPENDENCIES) $(EXTRA_libgnunet_plugin_datacache_postgres_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgnunet_plugin_datacache_postgres_la_LINK) $(am_libgnunet_plugin_datacache_postgres_la_rpath) $(libgnunet_plugin_datacache_postgres_la_OBJECTS) $(libgnunet_plugin_datacache_postgres_la_LIBADD) $(LIBS)
-libgnunet_plugin_datacache_sqlite.la: $(libgnunet_plugin_datacache_sqlite_la_OBJECTS) $(libgnunet_plugin_datacache_sqlite_la_DEPENDENCIES) 
+libgnunet_plugin_datacache_sqlite.la: $(libgnunet_plugin_datacache_sqlite_la_OBJECTS) $(libgnunet_plugin_datacache_sqlite_la_DEPENDENCIES) $(EXTRA_libgnunet_plugin_datacache_sqlite_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgnunet_plugin_datacache_sqlite_la_LINK) $(am_libgnunet_plugin_datacache_sqlite_la_rpath) $(libgnunet_plugin_datacache_sqlite_la_OBJECTS) $(libgnunet_plugin_datacache_sqlite_la_LIBADD) $(LIBS)
-libgnunet_plugin_datacache_template.la: $(libgnunet_plugin_datacache_template_la_OBJECTS) $(libgnunet_plugin_datacache_template_la_DEPENDENCIES) 
+libgnunet_plugin_datacache_template.la: $(libgnunet_plugin_datacache_template_la_OBJECTS) $(libgnunet_plugin_datacache_template_la_DEPENDENCIES) $(EXTRA_libgnunet_plugin_datacache_template_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgnunet_plugin_datacache_template_la_LINK) -rpath $(plugindir) $(libgnunet_plugin_datacache_template_la_OBJECTS) $(libgnunet_plugin_datacache_template_la_LIBADD) $(LIBS)
-libgnunetdatacache.la: $(libgnunetdatacache_la_OBJECTS) $(libgnunetdatacache_la_DEPENDENCIES) 
+libgnunetdatacache.la: $(libgnunetdatacache_la_OBJECTS) $(libgnunetdatacache_la_DEPENDENCIES) $(EXTRA_libgnunetdatacache_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgnunetdatacache_la_LINK) -rpath $(libdir) $(libgnunetdatacache_la_OBJECTS) $(libgnunetdatacache_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
@@ -779,31 +831,31 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-perf_datacache_mysql$(EXEEXT): $(perf_datacache_mysql_OBJECTS) $(perf_datacache_mysql_DEPENDENCIES) 
-	@rm -f perf_datacache_mysql$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(perf_datacache_mysql_OBJECTS) $(perf_datacache_mysql_LDADD) $(LIBS)
-perf_datacache_postgres$(EXEEXT): $(perf_datacache_postgres_OBJECTS) $(perf_datacache_postgres_DEPENDENCIES) 
+perf_datacache_heap$(EXEEXT): $(perf_datacache_heap_OBJECTS) $(perf_datacache_heap_DEPENDENCIES) $(EXTRA_perf_datacache_heap_DEPENDENCIES) 
+	@rm -f perf_datacache_heap$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(perf_datacache_heap_OBJECTS) $(perf_datacache_heap_LDADD) $(LIBS)
+perf_datacache_postgres$(EXEEXT): $(perf_datacache_postgres_OBJECTS) $(perf_datacache_postgres_DEPENDENCIES) $(EXTRA_perf_datacache_postgres_DEPENDENCIES) 
 	@rm -f perf_datacache_postgres$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(perf_datacache_postgres_OBJECTS) $(perf_datacache_postgres_LDADD) $(LIBS)
-perf_datacache_sqlite$(EXEEXT): $(perf_datacache_sqlite_OBJECTS) $(perf_datacache_sqlite_DEPENDENCIES) 
+perf_datacache_sqlite$(EXEEXT): $(perf_datacache_sqlite_OBJECTS) $(perf_datacache_sqlite_DEPENDENCIES) $(EXTRA_perf_datacache_sqlite_DEPENDENCIES) 
 	@rm -f perf_datacache_sqlite$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(perf_datacache_sqlite_OBJECTS) $(perf_datacache_sqlite_LDADD) $(LIBS)
-test_datacache_mysql$(EXEEXT): $(test_datacache_mysql_OBJECTS) $(test_datacache_mysql_DEPENDENCIES) 
-	@rm -f test_datacache_mysql$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_datacache_mysql_OBJECTS) $(test_datacache_mysql_LDADD) $(LIBS)
-test_datacache_postgres$(EXEEXT): $(test_datacache_postgres_OBJECTS) $(test_datacache_postgres_DEPENDENCIES) 
+test_datacache_heap$(EXEEXT): $(test_datacache_heap_OBJECTS) $(test_datacache_heap_DEPENDENCIES) $(EXTRA_test_datacache_heap_DEPENDENCIES) 
+	@rm -f test_datacache_heap$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_datacache_heap_OBJECTS) $(test_datacache_heap_LDADD) $(LIBS)
+test_datacache_postgres$(EXEEXT): $(test_datacache_postgres_OBJECTS) $(test_datacache_postgres_DEPENDENCIES) $(EXTRA_test_datacache_postgres_DEPENDENCIES) 
 	@rm -f test_datacache_postgres$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_datacache_postgres_OBJECTS) $(test_datacache_postgres_LDADD) $(LIBS)
-test_datacache_quota_mysql$(EXEEXT): $(test_datacache_quota_mysql_OBJECTS) $(test_datacache_quota_mysql_DEPENDENCIES) 
-	@rm -f test_datacache_quota_mysql$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_datacache_quota_mysql_OBJECTS) $(test_datacache_quota_mysql_LDADD) $(LIBS)
-test_datacache_quota_postgres$(EXEEXT): $(test_datacache_quota_postgres_OBJECTS) $(test_datacache_quota_postgres_DEPENDENCIES) 
+test_datacache_quota_heap$(EXEEXT): $(test_datacache_quota_heap_OBJECTS) $(test_datacache_quota_heap_DEPENDENCIES) $(EXTRA_test_datacache_quota_heap_DEPENDENCIES) 
+	@rm -f test_datacache_quota_heap$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_datacache_quota_heap_OBJECTS) $(test_datacache_quota_heap_LDADD) $(LIBS)
+test_datacache_quota_postgres$(EXEEXT): $(test_datacache_quota_postgres_OBJECTS) $(test_datacache_quota_postgres_DEPENDENCIES) $(EXTRA_test_datacache_quo