[svn] commit: r3823 - in /trunk: ./ configure.ac doc/Doxyfile src/bin/bind10/bind10.py.in src/lib/Makefile.am src/lib/nsas/ src/lib/python/isc/utils/

[BIND 10 source code commits]

Author: jelte
Date: Tue Dec 14 09:38:01 2010
New Revision: 3823

Log:
reintegrate branches/trac356

Added:
    trunk/src/lib/nsas/
      - copied from r3822, branches/trac356/src/lib/nsas/
Modified:
    trunk/   (props changed)
    trunk/configure.ac
    trunk/doc/Doxyfile
    trunk/src/bin/bind10/bind10.py.in   (props changed)
    trunk/src/lib/Makefile.am
    trunk/src/lib/python/isc/utils/   (props changed)

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Dec 14 09:38:01 2010
@@ -518,6 +518,8 @@
                  src/lib/datasrc/Makefile
                  src/lib/datasrc/tests/Makefile
                  src/lib/xfr/Makefile
+                 src/lib/nsas/Makefile
+                 src/lib/nsas/tests/Makefile
                ])
 AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
            src/bin/cfgmgr/tests/b10-cfgmgr_test.py

Modified: trunk/doc/Doxyfile
==============================================================================
--- trunk/doc/Doxyfile (original)
+++ trunk/doc/Doxyfile Tue Dec 14 09:38:01 2010
@@ -568,7 +568,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = ../src/lib/cc ../src/lib/config ../src/lib/dns ../src/lib/exceptions ../src/lib/datasrc ../src/bin/auth ../src/lib/bench
+INPUT                  = ../src/lib/cc ../src/lib/config ../src/lib/dns ../src/lib/exceptions ../src/lib/datasrc ../src/bin/auth ../src/lib/bench ../src/lib/nsas
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

Modified: trunk/src/lib/Makefile.am
==============================================================================
--- trunk/src/lib/Makefile.am (original)
+++ trunk/src/lib/Makefile.am Tue Dec 14 09:38:01 2010
@@ -1,1 +1,1 @@
-SUBDIRS = exceptions dns cc config datasrc python xfr bench
+SUBDIRS = exceptions dns cc config datasrc python xfr bench nsas