Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
frama-c
Commits
a541cb19
Commit
a541cb19
authored
5 years ago
by
Andre Maroneze
Browse files
Options
Downloads
Patches
Plain Diff
[server] use configure macro to warn about missing zmq; yojson is now mandatory
These macros should help configuring optional opam packages.
parent
cecabd0a
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/plugins/server/configure.ac
+3
-25
3 additions, 25 deletions
src/plugins/server/configure.ac
with
3 additions
and
25 deletions
src/plugins/server/configure.ac
+
3
−
25
View file @
a541cb19
...
@@ -37,20 +37,6 @@ m4_ifndef([FRAMAC_M4_MACROS], [m4_include(FRAMAC_SHARE/configure.ac)])
...
@@ -37,20 +37,6 @@ m4_ifndef([FRAMAC_M4_MACROS], [m4_include(FRAMAC_SHARE/configure.ac)])
check_plugin(server,PLUGIN_RELATIVE_PATH(plugin_file),[Server plug-in],yes)
check_plugin(server,PLUGIN_RELATIVE_PATH(plugin_file),[Server plug-in],yes)
########################################
# Server Main Configuration #
########################################
AC_MSG_CHECKING(for Yojson)
SERVER_LIB_YOJSON=$($OCAMLFIND query yojson -format %v)
if test -z "$SERVER_LIB_YOJSON"
then
AC_MSG_RESULT(Server disabled (use 'opam install yojson'))
plugin_disable(server)
else
AC_MSG_RESULT(yes)
fi
########################################
########################################
# Server ZMQ Configuration #
# Server ZMQ Configuration #
########################################
########################################
...
@@ -64,19 +50,11 @@ AC_ARG_ENABLE(
...
@@ -64,19 +50,11 @@ AC_ARG_ENABLE(
if test "$SERVER_ZMQ" = "yes" ;
if test "$SERVER_ZMQ" = "yes" ;
then
then
AC_MSG_CHECKING(for ZeroMQ)
configure_pkg([ZMQ],[zmq],
SERVER_LIB_ZMQ=$($OCAMLFIND query zmq -format %v)
[Server support for ZeroMQ disabled (try 'opam install zmq').])
if test -z "$SERVER_LIB_ZMQ"
plugin_use_pkg(server,zmq)
then
AC_MSG_RESULT(Server support for ZeroMQ disabled (use 'opam install zmq').)
SERVER_ZMQ=no
else
AC_MSG_RESULT(yes);
fi
fi
fi
AC_SUBST(SERVER_ZMQ)
#######################
#######################
# Generating Makefile #
# Generating Makefile #
#######################
#######################
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment