Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Cameo
cameo
Commits
699982b8
Commit
699982b8
authored
Sep 29, 2020
by
legoc
Browse files
Modified cameo.m4
parent
be76a3b1
Changes
1
Show whitespace changes
Inline
Side-by-side
cameo-api-cpp/m4/cameo.m4
View file @
699982b8
###############################################################################
# Version 29/0
4
/20
19
# Version 29/0
9
/20
20
# defines CAMEO_CFLAGS, CAMEO_LDFLAGS, CAMEO_LIBS
#
AC_DEFUN([AC_CAMEO],
...
...
@@ -10,7 +10,6 @@ AC_DEFUN([AC_CAMEO],
[with_cameo=yes])
AC_LIBZMQ
AC_LIBPROTOBUF_LITE
CAMEO_CFLAGS=
CAMEO_LIBS=
...
...
@@ -18,7 +17,7 @@ AC_DEFUN([AC_CAMEO],
if test $with_cameo != yes; then
cameo_possible_path="$with_cameo"
else
cameo_possible_path="/usr
/local /usr /opt /var
"
cameo_possible_path="/usr
/opt /var /usr/local
"
fi
AC_MSG_CHECKING([for cameo headers])
cameo_save_CXXFLAGS="$CXXFLAGS"
...
...
@@ -44,7 +43,7 @@ AC_DEFUN([AC_CAMEO],
CXXFLAGS="$CXXFLAGS $CAMEO_CFLAGS"
# search for library
LIBS="$LIBS $CAMEO_LIBS $LIBZMQ_LDFLAGS $LIB
PROTOBUF_LDFLAGS $LIBZMQ_LIB $LIBPROTOBUF
_LIB -lcameo"
LIBS="$LIBS $CAMEO_LIBS $LIBZMQ_LDFLAGS $LIB
ZMQ
_LIB -lcameo"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
[[]])],
...
...
@@ -56,8 +55,8 @@ AC_DEFUN([AC_CAMEO],
HAVE_CAMEO=1
LIBS="$cameo_save_LIBS"
CAMEO_LDFLAGS="$LIBZMQ_LDFLAG
S $LIBPROTOBUF_LDFLAGS $CAMEO_LIB
S"
CAMEO_LIBS="-lcameo $LIBZMQ_LIB
$LIBPROTOBUF_LIB
-pthread"
CAMEO_LDFLAGS="$
CAMEO_LIBS $
LIBZMQ_LDFLAGS"
CAMEO_LIBS="-lcameo $LIBZMQ_LIB -pthread"
fi
if test $cameo_found = yes; then
...
...
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