BIND 10 master, updated. a976de8f8bd3e6e0bf23385b47b28eb01edac2ce [master] Merge branch 'trac3305'

[BIND 10 source code commits]

The branch, master has been updated
       via  a976de8f8bd3e6e0bf23385b47b28eb01edac2ce (commit)
       via  1a9a2d0a3c9665dc260493e3e2e39bfad2643b96 (commit)
       via  87300261839710cb90f2176053d1bc5bcd3c0921 (commit)
       via  c44af5d2b81edb17e9fba450c1718a9dda630e3a (commit)
       via  b8dade8f46fa3fc0803a433cb4167327e8720d24 (commit)
      from  6ab70c0a6b695f23987fa38de47aeec1d56f97af (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 a976de8f8bd3e6e0bf23385b47b28eb01edac2ce
Merge: 6ab70c0 1a9a2d0
Author: Stephen Morris <stephen at isc.org>
Date:   Wed Feb 5 16:49:14 2014 +0000

    [master] Merge branch 'trac3305'

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

Summary of changes:
 src/bin/dhcp4/tests/Makefile.am     |    3 ++-
 src/bin/dhcp6/tests/Makefile.am     |    3 ++-
 src/hooks/dhcp/user_chk/Makefile.am |    3 ++-
 src/lib/dhcpsrv/tests/Makefile.am   |    3 ++-
 src/lib/hooks/tests/Makefile.am     |   24 ++++++++++++++----------
 5 files changed, 22 insertions(+), 14 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am
index c72b8b0..91b5a3b 100644
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -58,7 +58,8 @@ if HAVE_GTEST
 # to unexpected errors. For this reason, the --enable-static-link option is
 # ignored for unit tests built here.
 
-lib_LTLIBRARIES = libco1.la libco2.la
+nodistdir=$(abs_top_builddir)/src/bin/dhcp4/tests
+nodist_LTLIBRARIES = libco1.la libco2.la
 
 libco1_la_SOURCES  = callout_library_1.cc callout_library_common.h
 libco1_la_CXXFLAGS = $(AM_CXXFLAGS)
diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index f548ec2..92a18cf 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -54,7 +54,8 @@ if HAVE_GTEST
 # to unexpected errors. For this reason, the --enable-static-link option is
 # ignored for unit tests built here.
 
-lib_LTLIBRARIES = libco1.la libco2.la
+nodistdir=$(abs_top_builddir)/src/bin/dhcp6/tests
+nodist_LTLIBRARIES = libco1.la libco2.la
 
 libco1_la_SOURCES  = callout_library_1.cc callout_library_common.h
 libco1_la_CXXFLAGS = $(AM_CXXFLAGS)
diff --git a/src/hooks/dhcp/user_chk/Makefile.am b/src/hooks/dhcp/user_chk/Makefile.am
index 6b68f38..a7165d8 100644
--- a/src/hooks/dhcp/user_chk/Makefile.am
+++ b/src/hooks/dhcp/user_chk/Makefile.am
@@ -31,7 +31,8 @@ EXTRA_DIST = libdhcp_user_chk.dox
 #CLEANFILES = *.gcno *.gcda user_chk_messages.h user_chk_messages.cc s-messages
 CLEANFILES = *.gcno *.gcda
 
-lib_LTLIBRARIES = libdhcp_user_chk.la
+nodistdir=$(abs_top_builddir)/src/hooks/dhcp/user_chk
+nodist_LTLIBRARIES = libdhcp_user_chk.la
 libdhcp_user_chk_la_SOURCES  =
 libdhcp_user_chk_la_SOURCES += load_unload.cc
 libdhcp_user_chk_la_SOURCES += pkt_receive_co.cc
diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am
index ff57254..28f8049 100644
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@ -33,7 +33,8 @@ if HAVE_GTEST
 # to unexpected errors. For this reason, the --enable-static-link option is
 # ignored for unit tests built here.
 
-lib_LTLIBRARIES = libco1.la libco2.la
+nodistdir=$(abs_top_builddir)/src/lib/dhcpsrv/tests
+nodist_LTLIBRARIES = libco1.la libco2.la
 
 libco1_la_SOURCES  = callout_library.cc
 libco1_la_CXXFLAGS = $(AM_CXXFLAGS)
diff --git a/src/lib/hooks/tests/Makefile.am b/src/lib/hooks/tests/Makefile.am
index 36b6287..65153e2 100644
--- a/src/lib/hooks/tests/Makefile.am
+++ b/src/lib/hooks/tests/Makefile.am
@@ -36,6 +36,7 @@ if HAVE_GTEST
 # (see http://www.gnu.org/software/libtool/manual/html_node/Link-mode.html).
 # Use of these switches will guarantee that the .so files are created in the
 # .libs folder and they can be dlopened.
+#
 # Note that the shared libraries with callouts should not be used together with
 # the --enable-static-link option. With this option, the bind10 libraries are
 # statically linked with the program and if the callout invokes the methods
@@ -44,8 +45,9 @@ if HAVE_GTEST
 # to unexpected errors. For this reason, the --enable-static-link option is
 # ignored for unit tests built here.
 
-lib_LTLIBRARIES = libnvl.la libivl.la libfxl.la libbcl.la liblcl.la liblecl.la \
-                  libucl.la libfcl.la
+nodistdir=$(abs_top_builddir)/src/lib/hooks/tests
+nodist_LTLIBRARIES = libnvl.la  libivl.la libfxl.la libbcl.la liblcl.la \
+                     liblecl.la libucl.la libfcl.la
 
 # No version function
 libnvl_la_SOURCES  = no_version_library.cc
@@ -124,14 +126,16 @@ run_unittests_LDADD    = $(AM_LDADD) $(GTEST_LDADD)
 run_unittests_LDADD   += $(ALL_LIBS)
 run_unittests_LDADD   += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 
-# As noted in configure.ac, libtool doesn't work perfectly with Darwin: it embeds the
-# final install path in dynamic libraries and loadable modules refer to that path even
-# if its loaded within the source tree, so preventing tests from working - but only
-# when linking statically.  The solution used in other Makefiles (setting the path
-# to the dynamic libraries via an environment variable) don't seem to work.  What does
-# work is to run the unit test using libtool and specifying paths via -dlopen switches.
-# So... If running in an environment where we have to set the library path AND if
-# linking statically, override the "check" target and run the unit tests ourselves.
+# As noted in configure.ac, libtool doesn't work perfectly with Darwin: it
+# embeds the final install path in dynamic libraries and loadable modules refer
+# to that path even if its loaded within the source tree, so preventing tests
+# from working - but only when linking statically.  The solution used in other
+# Makefiles (setting the path to the dynamic libraries via an environment
+# variable) don't seem to work.  What does work is to run the unit test using
+# libtool and specifying paths via -dlopen switches.  So... If running in an
+# environment where we have to set the library path AND if linking statically,
+# override the "check" target and run the unit tests ourselves.
+
 if USE_STATIC_LINK
 if SET_ENV_LIBRARY_PATH
 check-TESTS: