BIND 10 master, updated. 2801bd9baadb96c2965b2cddc729e9ac2ec6dbb0 [master] place external libs at the end of LIBADDs for datasrc tests.

[BIND 10 source code commits]

The branch, master has been updated
       via  2801bd9baadb96c2965b2cddc729e9ac2ec6dbb0 (commit)
      from  237f4b641cf9fe63d28a5f283511c221bbb61cb9 (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 2801bd9baadb96c2965b2cddc729e9ac2ec6dbb0
Author: User <jinmei at freebsd8-64-4.lab.isc.org>
Date:   Thu May 24 01:31:45 2012 +0000

    [master] place external libs at the end of LIBADDs for datasrc tests.
    
    to reduce the risk of using already-installed older BIND10 libraries.
    basic approach was already agreed.  this particular fix should be trivial.
    so directly committing.

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

Summary of changes:
 src/lib/datasrc/tests/Makefile.am |    5 ++---
 src/lib/dns/tests/Makefile.am     |    4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am
index 90fb3e4..6c4a937 100644
--- a/src/lib/datasrc/tests/Makefile.am
+++ b/src/lib/datasrc/tests/Makefile.am
@@ -31,9 +31,7 @@ common_sources = run_unittests.cc
 common_sources += $(top_srcdir)/src/lib/dns/tests/unittest_util.h
 common_sources += $(top_srcdir)/src/lib/dns/tests/unittest_util.cc
 
-common_ldadd  = $(GTEST_LDADD)
-common_ldadd += $(SQLITE_LIBS)
-common_ldadd += $(top_builddir)/src/lib/datasrc/libdatasrc.la
+common_ldadd = $(top_builddir)/src/lib/datasrc/libdatasrc.la
 common_ldadd += $(top_builddir)/src/lib/dns/libdns++.la
 common_ldadd += $(top_builddir)/src/lib/util/libutil.la
 common_ldadd += $(top_builddir)/src/lib/log/liblog.la
@@ -41,6 +39,7 @@ common_ldadd += $(top_builddir)/src/lib/exceptions/libexceptions.la
 common_ldadd += $(top_builddir)/src/lib/cc/libcc.la
 common_ldadd += $(top_builddir)/src/lib/testutils/libtestutils.la
 common_ldadd += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+common_ldadd += $(GTEST_LDADD) $(SQLITE_LIBS)
 
 # The general tests
 run_unittests_SOURCES = $(common_sources)
diff --git a/src/lib/dns/tests/Makefile.am b/src/lib/dns/tests/Makefile.am
index 26b4630..6057828 100644
--- a/src/lib/dns/tests/Makefile.am
+++ b/src/lib/dns/tests/Makefile.am
@@ -71,11 +71,11 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 # an older version of botan, and somehow that version gets
 # linked if we don't
 run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS)
-run_unittests_LDADD = $(BOTAN_LIBS) $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
+run_unittests_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+run_unittests_LDADD += $(BOTAN_LIBS) $(GTEST_LDADD)
 endif
 
 noinst_PROGRAMS = $(TESTS)