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

fixed compilation
---

diff --git a/configure.ac b/configure.ac
index eb2c00a181..ebefa0422d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -856,10 +856,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 f5b09062bf..d743dddde9 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)