BIND 10 master, updated. 85c0d7fda08169181defc472f5905733a28249e8 [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  85c0d7fda08169181defc472f5905733a28249e8 (commit)
       via  af97b1eb9694904ee221a887238213db5bfb09e6 (commit)
      from  822b8644fc59c3894f13f58fae2e5a4229c1aff2 (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 85c0d7fda08169181defc472f5905733a28249e8
Merge: af97b1e 822b864
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Jun 20 15:34:26 2012 -0500

    [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit af97b1eb9694904ee221a887238213db5bfb09e6
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Jun 20 15:32:21 2012 -0500

    [master] reorder linking of libutil
    
    This fixes problem seen when trying to build on FreeBSD
    when the package is already installed (making it hard to upgrade).
    I tested this on CentOS system too.
    I don't like just re-ordering this but this is a quick hack for the problem.
    (Another workaround would be to bump the shared library version
    but that doesn't work due to the library has a name conflict with
    library in base system. These two points will be resolved later.)

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

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

-----------------------------------------------------------------------
diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index fb3aed7..ed23176 100644
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -47,5 +47,5 @@ if USE_CLANGPP
 liblog_la_CXXFLAGS += -Wno-error
 endif
 liblog_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-liblog_la_LIBADD   = $(LOG4CPLUS_LIBS) $(top_builddir)/src/lib/util/libutil.la
+liblog_la_LIBADD   = $(top_builddir)/src/lib/util/libutil.la $(LOG4CPLUS_LIBS)
 liblog_la_LDFLAGS = -no-undefined -version-info 1:0:0
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index 615f64b..3212daa 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -61,9 +61,9 @@ endif
 AM_CPPFLAGS += $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
 AM_LDFLAGS  += $(GTEST_LDFLAGS)
 
+AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
 AM_LDADD += $(top_builddir)/src/lib/log/liblog.la
 AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
-AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
 AM_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
 AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 AM_LDADD += $(GTEST_LDADD)