[5272] LIB_SO renamed to LEASE_CMDS_LIB_SO

diff --git a/src/hooks/dhcp/lease_cmds/tests/Makefile.am b/src/hooks/dhcp/lease_cmds/tests/Makefile.am
index 3a5f464080f0e57d3fea02637dbfb6921ddf98be..0e987d2cd662ce6d77918cf9cd42ef6e3918a75b 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/tests/Makefile.am
+++ b/src/hooks/dhcp/lease_cmds/tests/Makefile.am
@@ -1,16 +1,9 @@
 SUBDIRS = .
 
-# The 'parallel-tests' is the default only on recent automake versions.
-# However, since Kea 1.2.0 was released with files generated with automake version
-# that doesn't use it, we can't use parallel without rebuilding 1.2.0 tarballs.
-# We will flip this back to parallel-tests once 1.3.0 goes out with parallel
-# enabled.
-AUTOMAKE_OPTIONS = serial-tests
-
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/lease_cmds -I$(top_srcdir)/src/hooks/dhcp/lease_cmds
 AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CPPFLAGS += -DLIB_SO=\"$(abs_top_builddir)/src/hooks/dhcp/lease_cmds/.libs/libdhcp_lease_cmds.so\"
+AM_CPPFLAGS += -DLEASE_CMDS_LIB_SO=\"$(abs_top_builddir)/src/hooks/dhcp/lease_cmds/.libs/libdhcp_lease_cmds.so\"
 AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)

diff --git a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
index a57ec3011a4b48342f6e89d6376e660e6bdc40bb..64d35ce8ec9b8f0bd5ee71eaf6dc75030c38c39a 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
+++ b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
@@ -217,7 +217,7 @@ public:
     /// Also ensured there is no lease manager leftovers from previous
     /// test.
     LeaseCmdsTest()
-        :LibLoadTest(LIB_SO) {
+        :LibLoadTest(LEASE_CMDS_LIB_SO) {
         LeaseMgrFactory::destroy();
         lmptr_ = 0;
     }