BIND 10 trac1207, updated. 63bb58065a7136106c24e09f14a1f61177aa6d7f [1207] revert previous makefile removal

[BIND 10 source code commits]

The branch, trac1207 has been updated
       via  63bb58065a7136106c24e09f14a1f61177aa6d7f (commit)
      from  014746f188ea8de6931b9ec7496303db994c092d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 63bb58065a7136106c24e09f14a1f61177aa6d7f
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed May 16 18:22:32 2012 +0200

    [1207] revert previous makefile removal
    
    The removal of memory_datasrc.cc in b10_auth_SOURCES was premature; zone loading code is still in auth (but memory_datasrc-specific)

-----------------------------------------------------------------------

Summary of changes:
 src/bin/auth/Makefile.am       |    6 ++++++
 src/bin/auth/tests/Makefile.am |    7 +++++++
 2 files changed, 13 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index d80c010..257d8eb 100644
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -49,6 +49,12 @@ b10_auth_SOURCES += command.cc command.h
 b10_auth_SOURCES += common.h common.cc
 b10_auth_SOURCES += statistics.cc statistics.h
 b10_auth_SOURCES += main.cc
+# This is a temporary workaround for #1206, where the InMemoryClient has been
+# moved to an ldopened library. We could add that library to LDADD, but that
+# is nonportable. This should've been moot after #1207, but there is still
+# one dependency; the in-memory-specific zone loader call is still in
+# auth.
+b10_auth_SOURCES += ${top_srcdir}/src/lib/datasrc/memory_datasrc.cc
 
 nodist_b10_auth_SOURCES = auth_messages.h auth_messages.cc
 EXTRA_DIST += auth_messages.mes
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index 76ef1ab..3a7c54b 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -42,6 +42,13 @@ run_unittests_SOURCES += common_unittest.cc
 run_unittests_SOURCES += query_unittest.cc
 run_unittests_SOURCES += statistics_unittest.cc
 run_unittests_SOURCES += run_unittests.cc
+# This is a temporary workaround for #1206, where the InMemoryClient has been
+# moved to an ldopened library. We could add that library to LDADD, but that
+# is nonportable. This should've been moot after #1207, but there is still
+# one dependency; the in-memory-specific zone loader call is still in
+# auth.
+run_unittests_SOURCES += ${top_srcdir}/src/lib/datasrc/memory_datasrc.cc
+
 
 nodist_run_unittests_SOURCES = ../auth_messages.h ../auth_messages.cc