Merge #2096

Conflicts:
	src/lib/datasrc/memory/Makefile.am

diff --cc configure.ac
Simple merge

diff --cc src/lib/datasrc/memory/Makefile.am
index 8e7b03ed52e346c30133df20c828942742ed64d5,16e7fd0751c7dcf2ed8e55fd93f80bfe8da524c2..e0f49cc4c1f046160c2614b2f3937811685f4f59
--- 1/src/lib/datasrc/memory/Makefile.am
--- 2/src/lib/datasrc/memory/Makefile.am
+++ b/src/lib/datasrc/memory/Makefile.am
@@@ -10,7 -10,7 +10,9 @@@ CLEANFILES = *.gcno *.gcda datasrc_mess
  
  noinst_LTLIBRARIES = libdatasrc_memory.la
  
- libdatasrc_memory_la_SOURCES = rdata_encoder.h rdata_encoder.cc
- libdatasrc_memory_la_SOURCES += domaintree.h
+ libdatasrc_memory_la_SOURCES = \
+       rdata_serialization.h rdata_serialization.cc \
+       domaintree.h
 +libdatasrc_memory_la_SOURCES += zone_data.h
 +libdatasrc_memory_la_SOURCES += zone_table.h zone_table.cc
+ EXTRA_DIST  = rdata_serialization_priv.cc

diff --cc src/lib/datasrc/memory/tests/Makefile.am
index 2275d84b9ce5d226c9787df14f0bdddec8e898e0,5f1a40c32fb0fc44628c645a6630b7b0d7bdde3b..6195cc700ae3dbda9f7450c348cb686876631a08
--- 1/src/lib/datasrc/memory/tests/Makefile.am
--- 2/src/lib/datasrc/memory/tests/Makefile.am
+++ b/src/lib/datasrc/memory/tests/Makefile.am
@@@ -18,9 -18,8 +18,9 @@@ if HAVE_GTES
  TESTS += run_unittests
  
  run_unittests_SOURCES = run_unittests.cc
- run_unittests_SOURCES += rdata_encoder_unittest.cc
+ run_unittests_SOURCES += rdata_serialization_unittest.cc
  run_unittests_SOURCES += domaintree_unittest.cc
 +run_unittests_SOURCES += zone_table_unittest.cc
  
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS  = $(AM_LDFLAGS)  $(GTEST_LDFLAGS)