BIND 10 master, updated. 7efc7ddb385ef56c5df5a23474a10900bbe36cf9 [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  7efc7ddb385ef56c5df5a23474a10900bbe36cf9 (commit)
       via  fcdc7a7b7fbf23338d1c7165e6f3a8ffe4a20459 (commit)
       via  e0bcbb981c3b22f3380fcee592ae7cc2dadd0c00 (commit)
      from  57512ac60b298b3873b9ee74d46f4f56ab746494 (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 7efc7ddb385ef56c5df5a23474a10900bbe36cf9
Merge: fcdc7a7b7fbf23338d1c7165e6f3a8ffe4a20459 57512ac60b298b3873b9ee74d46f4f56ab746494
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Fri Apr 13 12:32:34 2012 -0500

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

commit fcdc7a7b7fbf23338d1c7165e6f3a8ffe4a20459
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Fri Apr 13 12:23:22 2012 -0500

    [master] increase library current version for libdns++
    
    To fix unittest from using wrong libdns++ version.
    
    Error was:
    
    terminate called after throwing an instance of 'isc::dns::EmptyLabel'
      what():  duplicate period
    
    Also isc::dns::NameParserException was added.
    
    Discussed some on jabber.

commit e0bcbb981c3b22f3380fcee592ae7cc2dadd0c00
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Fri Apr 13 12:22:05 2012 -0500

    [master] set library version
    
    make sure use the correct version of libdatasrc.
    
    Error was:
    Undefined symbol "_ZN3isc7datasrc35DATASRC_SQLITE_INCOMPATIBLE_VERSIONE"
    
    Discussed on jabber.

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

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

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am
index 1e743dd..2cdb8ea 100644
--- a/src/lib/datasrc/Makefile.am
+++ b/src/lib/datasrc/Makefile.am
@@ -31,6 +31,7 @@ libdatasrc_la_SOURCES += client.h iterator.h
 libdatasrc_la_SOURCES += database.h database.cc
 libdatasrc_la_SOURCES += factory.h factory.cc
 nodist_libdatasrc_la_SOURCES = datasrc_messages.h datasrc_messages.cc
+libdatasrc_la_LDFLAGS = -no-undefined -version-info 1:0:1
 
 pkglib_LTLIBRARIES =  sqlite3_ds.la memory_ds.la
 
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index 010c027..39f4429 100644
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -88,7 +88,7 @@ BUILT_SOURCES += rdataclass.h rdataclass.cc
 
 lib_LTLIBRARIES = libdns++.la
 
-libdns___la_LDFLAGS = -no-undefined -version-info 1:0:1
+libdns___la_LDFLAGS = -no-undefined -version-info 2:0:0
 
 libdns___la_SOURCES =
 libdns___la_SOURCES += edns.h edns.cc