Skip to content
Snippets Groups Projects
Commit a541cb19 authored by Andre Maroneze's avatar Andre Maroneze
Browse files

[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
...@@ -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 #
####################### #######################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment