From: Razvan Becheriu <ravan@isc.org>
Date: Wed, 6 Mar 2019 10:58:54 +0000 (+0200)
Subject: fixed compilation
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=313751b65367d3d9f27d2b1c8333c579b1d3b3c3;p=thirdparty%2Fkea.git

fixed compilation
---

diff --git a/configure.ac b/configure.ac
index 6ed00a7842..4444fd9bcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -870,10 +870,11 @@ if test "$CQL_CONFIG" != "" ; then
     fi
 
     CQL_INCLUDEDIR=`$CQL_CONFIG --cflags-only-I $cql_lib`
-    CQL_CPPFLAGS="$CQL_INCLUDEDIR `$CQL_CONFIG --cflags-only-other $cql_lib`"
+    CQL_CPPFLAGS="`$CQL_CONFIG --cflags-only-other $cql_lib`"
     CQL_LIBS="`$CQL_CONFIG --libs $cql_lib`"
     CQL_VERSION=`$CQL_CONFIG --modversion $cql_lib`
 
+    CQL_CPPFLAGS="${CQL_CPPFLAGS} ${CQL_INCLUDEDIR}"
     AC_SUBST(CQL_CPPFLAGS)
     AC_SUBST(CQL_LIBS)
 
diff --git a/src/lib/cql/tests/Makefile.am b/src/lib/cql/tests/Makefile.am
index cc96dfb72c..8d7b2f2015 100644
--- a/src/lib/cql/tests/Makefile.am
+++ b/src/lib/cql/tests/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = .
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(BOOST_INCLUDES) $(CQL_CPPFLAGS)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
@@ -22,15 +22,16 @@ libcql_unittests_SOURCES  = cql_connection_unittest.cc
 libcql_unittests_SOURCES += run_unittests.cc
 
 libcql_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(CQL_CPPFLAGS)
-libcql_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(CQL_LIBS)
+libcql_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(CQL_LIBS) -lcrypto -lssl
 
-libcql_unittests_LDADD  = $(top_builddir)/src/lib/cql/libkea-cql.la
+libcql_unittests_LDADD  = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libcql_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
-libcql_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
+libcql_unittests_LDADD += $(top_builddir)/src/lib/cql/libkea-cql.la
+libcql_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
+libcql_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libcql_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 libcql_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 libcql_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
-libcql_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libcql_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD)
 
 endif
diff --git a/src/lib/cql/tests/cql_connection_unittest.cc b/src/lib/cql/tests/cql_connection_unittest.cc
index a35717db39..6bce88a2ae 100644
--- a/src/lib/cql/tests/cql_connection_unittest.cc
+++ b/src/lib/cql/tests/cql_connection_unittest.cc
@@ -60,22 +60,5 @@ TEST(CqlConnection, statementMapHash) {
     ASSERT_EQ(map.size(), 1u);
 }
 
-/// @brief Check anything related to exchange types.
-TEST(CqlConnection, exchangeTypeCoverage) {
-    // Check that const and non-const are supported and both point to the same
-    // exchange type.
-    int i = 1;
-
-    // non-const
-    int* pi = &i;
-    boost::any bi(pi);
-
-    // const
-    int* const cpi = &i;
-    boost::any bci(cpi);
-
-    ASSERT_EQ(exchangeType(bi), exchangeType(bci));
-}
-
 }  // namespace