BIND 10 master, updated. f173bdf07ec3f4d099176dcc6b7f878b218fb93a [master] fix linker problem in lib/cc unit test

[BIND 10 source code commits]

The branch, master has been updated
       via  f173bdf07ec3f4d099176dcc6b7f878b218fb93a (commit)
      from  5c9b7307a56c8b578be2b5b1ad73799b899a2e93 (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 f173bdf07ec3f4d099176dcc6b7f878b218fb93a
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Apr 11 23:33:15 2012 +0000

    [master] fix linker problem in lib/cc unit test
    
    move GTEST_LDADD to the end of the list, so that the source tree libs get linked instead of those installed in the same location as gtest
    (reviewed on jabber by jinmei)

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

Summary of changes:
 src/lib/cc/tests/Makefile.am |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/cc/tests/Makefile.am b/src/lib/cc/tests/Makefile.am
index 4760855..08b7f33 100644
--- a/src/lib/cc/tests/Makefile.am
+++ b/src/lib/cc/tests/Makefile.am
@@ -24,11 +24,14 @@ run_unittests_SOURCES = data_unittests.cc session_unittests.cc run_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 
-run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD +=  $(top_builddir)/src/lib/cc/libcc.la
+# We need to put our libs first, in case gtest (or any dependency, really)
+# is installed in the same location as a different version of bind10
+# Otherwise the linker may not use the source tree libs 
+run_unittests_LDADD =  $(top_builddir)/src/lib/cc/libcc.la
 run_unittests_LDADD +=  $(top_builddir)/src/lib/log/liblog.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 += $(GTEST_LDADD)
 
 endif