[#3025] fix distcheck

Author: andrei-pavel

src/lib/database/testutils/Makefile.am

@@ -1,7 +1,8 @@
 SUBDIRS = .
 
-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 TEST_CA_DIR = $(realpath $(abs_srcdir)/../../asiolink/testutils/ca)
+
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += -DTEST_CA_DIR=\"$(TEST_CA_DIR)\"
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)

src/lib/mysql/tests/Makefile.am

@@ -1,7 +1,9 @@
 SUBDIRS = .
 
+TEST_CA_DIR = $(realpath $(abs_srcdir)/../../asiolink/testutils/ca)
+
 AM_CPPFLAGS  =
-AM_CPPFLAGS += -DABS_SRCDIR="\"$(abs_top_builddir)\""
+AM_CPPFLAGS += -DTEST_CA_DIR=\"$(TEST_CA_DIR)\"
 AM_CPPFLAGS += -DKEA_ADMIN=\"${abs_top_builddir}/src/bin/admin/kea-admin\"
 AM_CPPFLAGS += -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(MYSQL_CPPFLAGS)

src/lib/mysql/tests/mysql_connection_unittest.cc

@@ -1000,16 +1000,12 @@ TEST_F(MySqlConnectionTest, toKeaAdminParameters) {
     parameters = DatabaseConnection::parse(full_mysql_connection_string);
     kea_admin_parameters = MySqlConnection::toKeaAdminParameters(parameters);
     EXPECT_EQ(kea_admin_parameters,
-              vector<string>({"mysql", "--extra",
-                              "--ssl-cert " ABS_SRCDIR "/src/lib/asiolink/testutils/ca/"
-                              "kea-client.crt",
+              vector<string>({"mysql", "--extra", "--ssl-cert " TEST_CA_DIR "/kea-client.crt",
                               "--extra", "--ssl-cipher AES", "--extra", "--connect_timeout 10",
                               "--host", "127.0.0.1", "--extra",
-                              "--ssl-key " ABS_SRCDIR "/src/lib/asiolink/testutils/ca/"
-                                                      "kea-client.key",
-                              "--name", "keatest", "--password", "keatest", "--extra",
-                              "--ssl-ca " ABS_SRCDIR "/src/lib/asiolink/testutils/ca/kea-ca.crt",
-                              "--user", "keatest_secure"}));
+                              "--ssl-key " TEST_CA_DIR "/kea-client.key", "--name", "keatest",
+                              "--password", "keatest", "--extra",
+                              "--ssl-ca " TEST_CA_DIR "/kea-ca.crt", "--user", "keatest_secure"}));
 }
 
 }  // namespace

src/lib/pgsql/tests/Makefile.am

@@ -1,7 +1,6 @@
 SUBDIRS = .
 
 AM_CPPFLAGS  =
-AM_CPPFLAGS += -DABS_TOP_BUILDDIR="\"$(abs_top_builddir)\""
 AM_CPPFLAGS += -DKEA_ADMIN=\"${abs_top_builddir}/src/bin/admin/kea-admin\"
 AM_CPPFLAGS += -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(PGSQL_CPPFLAGS)