Commit 6f285fdd authored by Matthieu Dorier's avatar Matthieu Dorier

adapting Makefile.am and configure.ac to new sdskv libraries

parent 53667e1f
......@@ -13,7 +13,6 @@ EXTRA_DIST = prepare.sh
AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS =
AM_CXXFLAGS = -std=c++14 $(AM_CFLAGS)
SERVER_LIBS = @SERVER_LIBS@
CLIENT_LIBS = @CLIENT_LIBS@
......
......@@ -15,6 +15,9 @@ AM_PROG_CC_C_O
AC_PROG_CXX
AC_PROG_INSTALL
# check for C++14
AX_CXX_COMPILE_STDCXX_14
# checks for libraires
# pkg-config and libraries supporting that
PKG_PROG_PKG_CONFIG
......@@ -73,13 +76,13 @@ LIBS="$ARGOBOTS_LIBS $LIBS"
CPPFLAGS="$ARGOBOTS_CFLAGS $CPPFLAGS"
CFLAGS="$ARGOBOTS_CFLAGS $CFLAGS"
PKG_CHECK_MODULES([SDSKEYVALSERVER],[kv-server],[],
PKG_CHECK_MODULES([SDSKEYVALSERVER],[sdskv-server],[],
AC_MSG_ERROR([Could not find working sds-keyval server installation!]) )
SERVER_LIBS="$SDSKEYVALSERVER_LIBS $SERVER_LIBS"
SERVER_CPPFLAGS="$SDSKEYVALSERVER_CFLAGS $SERVER_CPPFLAGS"
SERVER_CFLAGS="$SDSKEYVALSERVER_CFLAGS $SERVER_CFLAGS"
PKG_CHECK_MODULES([SDSKEYVALCLIENT],[kv-client],[],
PKG_CHECK_MODULES([SDSKEYVALCLIENT],[sdskv-client],[],
AC_MSG_ERROR([Could not find working sds-keyval client installation!]) )
SERVER_LIBS="$SDSKEYVALCLIENT_LIBS $SERVER_LIBS"
SERVER_CPPFLAGS="$SDSKEYVALCLIENT_CFLAGS $SERVER_CPPFLAGS"
......
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