BIND 10 master, updated. 0d105f4f7e44208c0b7f25e88c5a67b3cf6bf0e2 [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  0d105f4f7e44208c0b7f25e88c5a67b3cf6bf0e2 (commit)
       via  cb0e8914ce77fe7bab8b9c016a822c2a75affcd8 (commit)
      from  0ef581a23047183b6908f80d59c7457b7035849f (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 0d105f4f7e44208c0b7f25e88c5a67b3cf6bf0e2
Merge: cb0e8914ce77fe7bab8b9c016a822c2a75affcd8 0ef581a23047183b6908f80d59c7457b7035849f
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu May 17 06:33:48 2012 -0500

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

commit cb0e8914ce77fe7bab8b9c016a822c2a75affcd8
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu May 17 06:31:01 2012 -0500

    [master] set the library version for libdhcp++
    
    The libdhcp++ API was changed as part of the refactoring.
    
    When linking new tests to old library it fails with:
    
    /libexec/ld-elf.so.1:
    /usr/home/jreed/builder/work/BIND10-cppcheck/20120516153001-FreeBSD8-amd64-GCC/build/src/bin/dhcp4/tests/.libs/dhcp4_unittests:
    Undefined symbol "_ZN3isc4dhcp6OptionC1ENS1_8UniverseEtRKSt6vectorIhSaIhEE"
    
    This is:
     isc::dhcp::Option::Option(isc::dhcp::Option::Universe, unsigned short,
    std::vector<unsigned char, std::allocator<unsigned char> > const&)
    
    See http://bind10.isc.org/wiki/LibraryVersioning for details.

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

Summary of changes:
 src/lib/dhcp/Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
index 9d00911..d6af32c 100644
--- a/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@ -29,3 +29,4 @@ EXTRA_DIST  = README
 libdhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
 libdhcp___la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
 libdhcp___la_LIBADD   = $(top_builddir)/src/lib/util/libutil.la
+libdhcp___la_LDFLAGS = -no-undefined -version-info 1:0:0