From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 2 Nov 2012 20:26:24 +0000 (-0700)
Subject: [2371] Merge branch 'trac2369' into trac2371
X-Git-Tag: trac2487_base~1^2~21^2~30^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fadf2a8a91581c95e080de2d4f60e9115e35416b;p=thirdparty%2Fkea.git

[2371] Merge branch 'trac2369' into trac2371
---

fadf2a8a91581c95e080de2d4f60e9115e35416b
diff --cc src/lib/dns/Makefile.am
index 5cf07321c0,17d62964f3..e81ef76a8d
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@@ -93,9 -93,9 +93,10 @@@ libb10_dns___la_LDFLAGS = -no-undefine
  libb10_dns___la_SOURCES =
  libb10_dns___la_SOURCES += edns.h edns.cc
  libb10_dns___la_SOURCES += exceptions.h exceptions.cc
+ libb10_dns___la_SOURCES += master_lexer_inputsource.h master_lexer_inputsource.cc
  libb10_dns___la_SOURCES += labelsequence.h labelsequence.cc
  libb10_dns___la_SOURCES += masterload.h masterload.cc
 +libb10_dns___la_SOURCES += master_lexer.h master_lexer.cc
  libb10_dns___la_SOURCES += message.h message.cc
  libb10_dns___la_SOURCES += messagerenderer.h messagerenderer.cc
  libb10_dns___la_SOURCES += name.h name.cc
diff --cc src/lib/dns/tests/Makefile.am
index 931896c6af,2f51496470..d5adc21e8f
--- a/src/lib/dns/tests/Makefile.am
+++ b/src/lib/dns/tests/Makefile.am
@@@ -22,10 -22,9 +22,11 @@@ if HAVE_GTES
  TESTS += run_unittests
  run_unittests_SOURCES = unittest_util.h unittest_util.cc
  run_unittests_SOURCES += edns_unittest.cc
+ run_unittests_SOURCES += master_lexer_inputsource_unittest.cc
  run_unittests_SOURCES += labelsequence_unittest.cc
  run_unittests_SOURCES += messagerenderer_unittest.cc
 +run_unittests_SOURCES += master_lexer_token_unittest.cc
 +run_unittests_SOURCES += master_lexer_unittest.cc
  run_unittests_SOURCES += name_unittest.cc
  run_unittests_SOURCES += nsec3hash_unittest.cc
  run_unittests_SOURCES += rrclass_unittest.cc rrtype_unittest.cc