BIND 10 trac117, updated. 130ba31d0829fa47a5e245490a9ae172d1c91b7c [trac117] Make distcheck work

[BIND 10 source code commits]

The branch, trac117 has been updated
       via  130ba31d0829fa47a5e245490a9ae172d1c91b7c (commit)
       via  ae9a05a4c5d73b3d32303b622c6b7d0c04d061d3 (commit)
      from  d7a9547198d61bc455d41ba45f6f14874f05c1d5 (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 130ba31d0829fa47a5e245490a9ae172d1c91b7c
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Feb 17 13:37:14 2011 +0100

    [trac117] Make distcheck work

commit ae9a05a4c5d73b3d32303b622c6b7d0c04d061d3
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Feb 17 13:24:36 2011 +0100

    [trac117] Add two boost:: to compile with g++

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

Summary of changes:
 src/lib/dns/Makefile.am                |    4 ++--
 src/lib/dns/rdata/generic/nsec3_50.cc  |    4 ++--
 src/lib/dns/tests/testdata/Makefile.am |    3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index e467ad4..c5c5cd1 100644
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -85,11 +85,11 @@ libdns___la_SOURCES += rrtype.cc
 libdns___la_SOURCES += question.h question.cc
 libdns___la_SOURCES += util/sha1.h util/sha1.cc
 libdns___la_SOURCES += tsigkey.h tsigkey.cc
+libdns___la_SOURCES += rdata/generic/detail/nsec_bitmap.h
+libdns___la_SOURCES += rdata/generic/detail/nsec_bitmap.cc
 
 nodist_libdns___la_SOURCES = rdataclass.cc rrclass.h rrtype.h
 nodist_libdns___la_SOURCES += rrparamregistry.cc
-nodist_libdns___la_SOURCES += rdata/generic/detail/nsec_bitmap.h
-nodist_libdns___la_SOURCES += rdata/generic/detail/nsec_bitmap.cc
 
 rrclass.h: rrclass-placeholder.h
 rrtype.h: rrtype-placeholder.h
diff --git a/src/lib/dns/rdata/generic/nsec3_50.cc b/src/lib/dns/rdata/generic/nsec3_50.cc
index ef68b35..01ffefa 100644
--- a/src/lib/dns/rdata/generic/nsec3_50.cc
+++ b/src/lib/dns/rdata/generic/nsec3_50.cc
@@ -80,8 +80,8 @@ NSEC3::NSEC3(const string& nsec3_str) :
     // between iteration and salt, we extract this field as string and convert
     // to integer.
     try {
-        iterations = lexical_cast<unsigned int>(iterations_str);
-    } catch (const bad_lexical_cast&) {
+        iterations = boost::lexical_cast<unsigned int>(iterations_str);
+    } catch (const boost::bad_lexical_cast&) {
         isc_throw(InvalidRdataText, "Bad NSEC3 iteration: " << iterations_str);
     }
     if (iterations > 0xffff) {
diff --git a/src/lib/dns/tests/testdata/Makefile.am b/src/lib/dns/tests/testdata/Makefile.am
index f2a5705..bbba8ed 100644
--- a/src/lib/dns/tests/testdata/Makefile.am
+++ b/src/lib/dns/tests/testdata/Makefile.am
@@ -57,7 +57,7 @@ EXTRA_DIST += rdata_nsec_fromWire6.spec rdata_nsec_fromWire7.spec
 EXTRA_DIST += rdata_nsec_fromWire8.spec rdata_nsec_fromWire9.spec
 EXTRA_DIST += rdata_nsec_fromWire10.spec
 EXTRA_DIST += rdata_nsec3param_fromWire1
-EXTRA_DIST += rdata_nsec3_fromWire1 rdata_nsec3_fromWire2 rdata_nsec3_fromWire3
+EXTRA_DIST += rdata_nsec3_fromWire1 rdata_nsec3_fromWire3
 EXTRA_DIST += rdata_nsec3_fromWire4.spec rdata_nsec3_fromWire5.spec
 EXTRA_DIST += rdata_nsec3_fromWire6.spec rdata_nsec3_fromWire7.spec
 EXTRA_DIST += rdata_nsec3_fromWire8.spec rdata_nsec3_fromWire9.spec
@@ -81,6 +81,7 @@ EXTRA_DIST += rdata_tsig_fromWire9.spec
 EXTRA_DIST += rdata_tsig_toWire1.spec rdata_tsig_toWire2.spec
 EXTRA_DIST += rdata_tsig_toWire3.spec rdata_tsig_toWire4.spec
 EXTRA_DIST += rdata_tsig_toWire5.spec
+EXTRA_DIST += rdata_nsec3_fromWire2.spec
 
 .spec.wire:
 	./gen-wiredata.py -o $@ $<