Commit 0e8f34e7 authored by legoc's avatar legoc

Modified configuration.

parent 6c4c545e
......@@ -14,8 +14,6 @@ AC_PROG_LIBTOOL
AC_CONFIG_MACRO_DIR([m4])
AX_BOOST_BASE([1.41],, [AC_MSG_ERROR([Boost 1.41 required])])
AX_BOOST_SYSTEM
AX_BOOST_THREAD
AC_CAMEO
CT_CXXFLAGS="$BOOST_CPPFLAGS \
......@@ -28,10 +26,7 @@ CT_LDFLAGS="$BOOST_LDFLAGS \
$PROTOBUF_LDFLAGS \
$CAMEO_LDFLAGS"
CT_LIBS="$BOOST_SYSTEM_LIB $BOOST_THREAD_LIB \
$ZMQ_LIB \
$PROTOBUF_LIB \
$CAMEO_LIBS"
CT_LIBS="$CAMEO_LIBS $BOOST_SYSTEM_LIB"
AC_SUBST(CT_CXXFLAGS)
AC_SUBST(CT_LDFLAGS)
......
###############################################################################
# Version 11/07/2016
# Version 18/05/2017
# defines CAMEO_CFLAGS, CAMEO_LDFLAGS, CAMEO_LIBS
#
AC_DEFUN([AC_CAMEO],
......@@ -11,9 +11,9 @@ AC_DEFUN([AC_CAMEO],
AC_LIBZMQ
AC_LIBPROTOBUF_LITE
AX_BOOST_SYSTEM
AX_BOOST_DATE_TIME
AX_BOOST_THREAD
AX_BOOST_THREAD
AX_BOOST_SYSTEM
CAMEO_CFLAGS=
CAMEO_LIBS=
......@@ -60,7 +60,7 @@ AC_DEFUN([AC_CAMEO],
HAVE_CAMEO=1
LIBS="$cameo_save_LIBS"
CAMEO_LDFLAGS="$LIBZMQ_LDFLAGS $LIBPROTOBUF_LDFLAGS $CAMEO_LIBS"
CAMEO_LIBS="$LIBZMQ_LIB $LIBPROTOBUF_LIB $BOOST_THREAD_LIB -lcameo"
CAMEO_LIBS="-lcameo $LIBZMQ_LIB $LIBPROTOBUF_LIB $BOOST_THREAD_LIB"
fi
if test $cameo_found = yes; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment