Skip to content

Commit f63725a

Browse files
committed
[#3082] Fix fist try
1 parent 3f13320 commit f63725a

File tree

23 files changed

+30
-29
lines changed

23 files changed

+30
-29
lines changed

src/hooks/dhcp/bootp/libloadtests/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/bootp -I$(top_srcdir)/src/hooks/dhcp/bootp
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DLIBDHCP_BOOTP_SO=\"$(abs_top_builddir)/src/hooks/dhcp/bootp/.libs/libdhcp_bootp.so\"
77
AM_CXXFLAGS = $(KEA_CXXFLAGS)
88

@@ -26,7 +26,7 @@ hook_load_unittests_SOURCES += load_unload_unittests.cc
2626
hook_load_unittests_SOURCES += run_unittests.cc
2727
hook_load_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
2828
hook_load_unittests_CXXFLAGS = $(AM_CXXFLAGS)
29-
hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
29+
hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
3030

3131
hook_load_unittests_LDADD = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
3232
hook_load_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la

src/hooks/dhcp/flex_option/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SUBDIRS = . libloadtests tests
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
4-
AM_CPPFLAGS += $(BOOST_INCLUDES)
4+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
55
AM_CXXFLAGS = $(KEA_CXXFLAGS)
66

77
# Ensure that the message file and doxygen file is included in the distribution

src/hooks/dhcp/flex_option/libloadtests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/flex_option -I$(top_srcdir)/src/hooks/dhcp/flex_option
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DFLEX_OPTION_LIB_SO=\"$(abs_top_builddir)/src/hooks/dhcp/flex_option/.libs/libdhcp_flex_option.so\"
77
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
88

src/hooks/dhcp/flex_option/tests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/flex_option -I$(top_srcdir)/src/hooks/dhcp/flex_option
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DFLEX_OPTION_LIB_SO=\"$(abs_top_builddir)/src/hooks/dhcp/flex_option/.libs/libdhcp_flex_option.so\"
77
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
88

src/hooks/dhcp/high_availability/libloadtests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/high_availability -I$(top_srcdir)/src/hooks/dhcp/high_availability
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DLIBDHCP_HA_SO=\"$(abs_top_builddir)/src/hooks/dhcp/high_availability/.libs/libdhcp_ha.so\"
77
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
88

src/hooks/dhcp/lease_cmds/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SUBDIRS = . tests libloadtests
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
4-
AM_CPPFLAGS += $(BOOST_INCLUDES)
4+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
55
AM_CXXFLAGS = $(KEA_CXXFLAGS)
66

77
# Ensure that the message file and doxygen file is included in the distribution

src/hooks/dhcp/lease_cmds/libloadtests/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/lease_cmds -I$(top_srcdir)/src/hooks/dhcp/lease_cmds
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DLIBDHCP_LEASE_CMDS_SO=\"$(abs_top_builddir)/src/hooks/dhcp/lease_cmds/.libs/libdhcp_lease_cmds.so\"
77
AM_CXXFLAGS = $(KEA_CXXFLAGS)
88

@@ -26,7 +26,7 @@ hook_load_unittests_SOURCES += load_unload_unittests.cc
2626
hook_load_unittests_SOURCES += run_unittests.cc
2727
hook_load_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
2828
hook_load_unittests_CXXFLAGS = $(AM_CXXFLAGS)
29-
hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
29+
hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
3030

3131
hook_load_unittests_LDADD = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
3232
hook_load_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la

src/hooks/dhcp/lease_cmds/tests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/lease_cmds -I$(top_srcdir)/src/hooks/dhcp/lease_cmds
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DLEASE_CMDS_LIB_SO=\"$(abs_top_builddir)/src/hooks/dhcp/lease_cmds/.libs/libdhcp_lease_cmds.so\"
77
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
88

src/hooks/dhcp/perfmon/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SUBDIRS = . libloadtests tests
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
4-
AM_CPPFLAGS += $(BOOST_INCLUDES)
4+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
55
AM_CXXFLAGS = $(KEA_CXXFLAGS)
66

77
# Ensure that the message file and doxygen file is included in the distribution

src/hooks/dhcp/perfmon/libloadtests/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/perfmon -I$(top_srcdir)/src/hooks/dhcp/perfmon
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DLIBDHCP_PERFMON_SO=\"$(abs_top_builddir)/src/hooks/dhcp/perfmon/.libs/libdhcp_perfmon.so\"
77
AM_CXXFLAGS = $(KEA_CXXFLAGS)
88

@@ -26,7 +26,7 @@ hook_load_unittests_SOURCES += load_unload_unittests.cc
2626
hook_load_unittests_SOURCES += run_unittests.cc
2727
hook_load_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
2828
hook_load_unittests_CXXFLAGS = $(AM_CXXFLAGS)
29-
hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
29+
hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
3030

3131
hook_load_unittests_LDADD = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
3232
hook_load_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la

src/hooks/dhcp/perfmon/tests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/perfmon -I$(top_srcdir)/src/hooks/dhcp/perfmon
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DPERFMON_LIB_SO=\"$(abs_top_builddir)/src/hooks/dhcp/perfmon/.libs/libdhcp_perfmon.so\"
77
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
88

src/hooks/dhcp/run_script/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SUBDIRS = . libloadtests tests
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
4-
AM_CPPFLAGS += $(BOOST_INCLUDES)
4+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
55
AM_CXXFLAGS = $(KEA_CXXFLAGS)
66

77
# Ensure that the message file and doxygen file is included in the distribution

src/hooks/dhcp/run_script/libloadtests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/run_script -I$(top_srcdir)/src/hooks/dhcp/run_script
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DLIBRUN_SCRIPT_SO=\"$(abs_top_builddir)/src/hooks/dhcp/run_script/.libs/libdhcp_run_script.so\"
77
AM_CPPFLAGS += -DRUN_SCRIPT_TEST_SH=\"$(abs_top_builddir)/src/hooks/dhcp/run_script/tests/run_script_test.sh\"
88
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"

src/hooks/dhcp/run_script/tests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ noinst_SCRIPTS = run_script_test.sh
66

77
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
88
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/run_script -I$(top_srcdir)/src/hooks/dhcp/run_script
9-
AM_CPPFLAGS += $(BOOST_INCLUDES)
9+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
1010
AM_CPPFLAGS += -DRUN_SCRIPT_LIB_SO=\"$(abs_top_builddir)/src/hooks/dhcp/run_script/.libs/libdhcp_run_script.so\"
1111
AM_CPPFLAGS += -DTEST_LOG_FILE=\"$(abs_top_builddir)/src/hooks/dhcp/run_script/tests/test.log\"
1212
AM_CPPFLAGS += -DRUN_SCRIPT_TEST_SH=\"$(abs_top_builddir)/src/hooks/dhcp/run_script/tests/run_script_test.sh\"

src/hooks/dhcp/stat_cmds/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SUBDIRS = . tests libloadtests
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
4-
AM_CPPFLAGS += $(BOOST_INCLUDES)
4+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
55
AM_CXXFLAGS = $(KEA_CXXFLAGS)
66

77
# Ensure that the message file and doxygen file is included in the distribution

src/hooks/dhcp/stat_cmds/libloadtests/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/stat_cmds -I$(top_srcdir)/src/hooks/dhcp/stat_cmds
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DLIBDHCP_STAT_CMDS_SO=\"$(abs_top_builddir)/src/hooks/dhcp/stat_cmds/.libs/libdhcp_stat_cmds.so\"
77
AM_CXXFLAGS = $(KEA_CXXFLAGS)
88

@@ -26,7 +26,7 @@ hook_load_unittests_SOURCES += load_unload_unittests.cc
2626
hook_load_unittests_SOURCES += run_unittests.cc
2727
hook_load_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
2828
hook_load_unittests_CXXFLAGS = $(AM_CXXFLAGS)
29-
hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
29+
hook_load_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
3030

3131
hook_load_unittests_LDADD = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
3232
hook_load_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la

src/hooks/dhcp/stat_cmds/tests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -I$(top_builddir)/src/hooks/dhcp/stat_cmds -I$(top_srcdir)/src/hooks/dhcp/stat_cmds
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66
AM_CPPFLAGS += -DSTAT_CMDS_LIB_SO=\"$(abs_top_builddir)/src/hooks/dhcp/stat_cmds/.libs/libdhcp_stat_cmds.so\"
77
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
88

src/lib/d2srv/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SUBDIRS = . testutils tests
22

33
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
4-
AM_CPPFLAGS += $(BOOST_INCLUDES)
4+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
55

66
AM_CXXFLAGS = $(KEA_CXXFLAGS)
77

src/lib/d2srv/tests/Makefile.am

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
4-
AM_CPPFLAGS += $(BOOST_INCLUDES)
4+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
55

66
AM_CXXFLAGS = $(KEA_CXXFLAGS)
77

@@ -25,7 +25,7 @@ libd2srv_unittests_SOURCES += dns_client_unittests.cc
2525
libd2srv_unittests_SOURCES += nc_trans_unittests.cc
2626

2727
libd2srv_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
28-
libd2srv_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
28+
libd2srv_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS)
2929

3030
libd2srv_unittests_LDADD = $(top_builddir)/src/lib/d2srv/testutils/libd2srvtest.la
3131
libd2srv_unittests_LDADD += $(top_builddir)/src/lib/d2srv/libkea-d2srv.la
@@ -46,7 +46,8 @@ libd2srv_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
4646
libd2srv_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
4747
libd2srv_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
4848
libd2srv_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
49-
libd2srv_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
49+
libd2srv_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(CRYPTO_LIBS)
50+
libd2srv_unittests_LDADD += $(GTEST_LDADD)
5051

5152
endif
5253

src/lib/d2srv/testutils/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
4-
AM_CPPFLAGS += $(BOOST_INCLUDES)
4+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
55

66
AM_CXXFLAGS = $(KEA_CXXFLAGS)
77

src/lib/dhcpsrv/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ AM_CPPFLAGS += -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\""
1212
AM_CPPFLAGS += -DTOP_BUILDDIR="\"$(top_builddir)\""
1313
# Set location of the kea-lfc binary.
1414
AM_CPPFLAGS += -DKEA_LFC_EXECUTABLE="\"$(kea_lfc_location)\""
15-
AM_CPPFLAGS += $(BOOST_INCLUDES)
15+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
1616

1717
AM_CXXFLAGS = $(KEA_CXXFLAGS)
1818

src/lib/dhcpsrv/tests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SUBDIRS = .
22

3-
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
3+
AM_CPPFLAGS = -I$(top_builddir)/s$(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
44
AM_CPPFLAGS += $(BOOST_INCLUDES)
55
AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dhcpsrv/tests\"
66
AM_CPPFLAGS += -DDHCP_DATA_DIR=\"$(abs_top_builddir)/src/lib/dhcpsrv/tests\"

src/lib/dhcpsrv/testutils/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = .
22

33
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
44
AM_CPPFLAGS += -DDATABASE_SCRIPTS_DIR=\"$(abs_top_srcdir)/src/share/database/scripts\"
5-
AM_CPPFLAGS += $(BOOST_INCLUDES)
5+
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
66

77
AM_CXXFLAGS = $(KEA_CXXFLAGS)
88

0 commit comments

Comments
 (0)