From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 4 Aug 2017 14:11:19 +0000 (+0200)
Subject: [5272] LIB_SO renamed to LEASE_CMDS_LIB_SO
X-Git-Tag: trac5124a_base~20^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c43189719c289739b04c2cb544a94961872fd69b;p=thirdparty%2Fkea.git

[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 3a5f464080..0e987d2cd6 100644
--- 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 a57ec3011a..64d35ce8ec 100644
--- 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;
     }