fixed compilation

diff --git a/configure.ac b/configure.ac
index eb2c00a181af61ff8d3bc0abaaa09dbaf25a4dfb..ebefa0422d5e1b94c196e6aa1ba0dd15c4c3e163 100644 (file)
--- 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 f5b09062bf3093bcfdef99c877b58be039dd108c..d743dddde9291ac0e636a56328513a816b338df9 100644 (file)
--- 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)