From: Razvan Becheriu Date: Thu, 3 Oct 2024 11:16:17 +0000 (+0300) Subject: [#3536] add crypto ligs to mysql and pgsql X-Git-Tag: Kea-2.7.4~107 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d7409824f02ba19ac5be0b3a1bec88a1698c6da3;p=thirdparty%2Fkea.git [#3536] add crypto ligs to mysql and pgsql --- diff --git a/src/lib/mysql/Makefile.am b/src/lib/mysql/Makefile.am index b3aae015bf..89553ed22d 100644 --- a/src/lib/mysql/Makefile.am +++ b/src/lib/mysql/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = . testutils tests AM_CPPFLAGS = AM_CPPFLAGS += -DKEA_ADMIN=\"@sbindir@/kea-admin\" AM_CPPFLAGS += -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib -AM_CPPFLAGS += $(BOOST_INCLUDES) $(MYSQL_CPPFLAGS) +AM_CPPFLAGS += $(BOOST_INCLUDES) $(MYSQL_CPPFLAGS) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES) AM_CXXFLAGS = $(KEA_CXXFLAGS) @@ -20,7 +20,7 @@ libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libkea_mysql_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) +libkea_mysql_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(CRYPTO_LIBS) libkea_mysql_la_LDFLAGS = -no-undefined -version-info 82:0:0 diff --git a/src/lib/mysql/tests/Makefile.am b/src/lib/mysql/tests/Makefile.am index 8946e5f5dc..4a68a34dd5 100644 --- a/src/lib/mysql/tests/Makefile.am +++ b/src/lib/mysql/tests/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS = 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) +AM_CPPFLAGS += $(BOOST_INCLUDES) $(MYSQL_CPPFLAGS) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES) AM_CXXFLAGS = $(KEA_CXXFLAGS) @@ -38,7 +38,7 @@ libmysql_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la libmysql_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la libmysql_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libmysql_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libmysql_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD) +libmysql_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD) $(CRYPTO_LIBS) endif diff --git a/src/lib/pgsql/Makefile.am b/src/lib/pgsql/Makefile.am index e93ac1d1dc..4c99306a7d 100644 --- a/src/lib/pgsql/Makefile.am +++ b/src/lib/pgsql/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = . testutils tests AM_CPPFLAGS = AM_CPPFLAGS += -DKEA_ADMIN=\"@sbindir@/kea-admin\" AM_CPPFLAGS += -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib -AM_CPPFLAGS += $(BOOST_INCLUDES) $(PGSQL_CPPFLAGS) +AM_CPPFLAGS += $(BOOST_INCLUDES) $(PGSQL_CPPFLAGS) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES) AM_CXXFLAGS = $(KEA_CXXFLAGS) @@ -20,7 +20,7 @@ libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libkea_pgsql_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) +libkea_pgsql_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(CRYPTO_LIBS) libkea_pgsql_la_LDFLAGS = -no-undefined -version-info 82:0:0 diff --git a/src/lib/pgsql/tests/Makefile.am b/src/lib/pgsql/tests/Makefile.am index 52b906de8b..7dcc6e270f 100644 --- a/src/lib/pgsql/tests/Makefile.am +++ b/src/lib/pgsql/tests/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = . AM_CPPFLAGS = 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) +AM_CPPFLAGS += $(BOOST_INCLUDES) $(PGSQL_CPPFLAGS) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES) AM_CXXFLAGS = $(KEA_CXXFLAGS) @@ -36,7 +36,7 @@ libpgsql_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la libpgsql_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la libpgsql_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libpgsql_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libpgsql_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD) +libpgsql_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD) $(CRYPTO_LIBS) endif