Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mobject-store
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
12
Issues
12
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sds
mobject-store
Commits
6f285fdd
Commit
6f285fdd
authored
Feb 05, 2018
by
Matthieu Dorier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adapting Makefile.am and configure.ac to new sdskv libraries
parent
53667e1f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
Makefile.am
Makefile.am
+0
-1
configure.ac
configure.ac
+5
-2
No files found.
Makefile.am
View file @
6f285fdd
...
...
@@ -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@
...
...
configure.ac
View file @
6f285fdd
...
...
@@ -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],[
sds
kv-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],[
sds
kv-client],[],
AC_MSG_ERROR([Could not find working sds-keyval client installation!]) )
SERVER_LIBS="$SDSKEYVALCLIENT_LIBS $SERVER_LIBS"
SERVER_CPPFLAGS="$SDSKEYVALCLIENT_CFLAGS $SERVER_CPPFLAGS"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment