X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/328201a5b60e1ba8de380af7d39fbfc732afb614..a9310b5b493541cca337c1f4f012dbf3acfcc94e:/configure.ac diff --git a/configure.ac b/configure.ac index 519a674..547fdc2 100644 --- a/configure.ac +++ b/configure.ac @@ -244,7 +244,7 @@ AC_ARG_WITH([user-prefix], user_rapi="${withval}rapi"; user_confd="${withval}confd"; user_noded="$user_default"; - user_mond="${withval}mond"], + user_mond="$user_default"], [user_masterd="$user_default"; user_rapi="$user_default"; user_confd="$user_default"; @@ -269,7 +269,7 @@ AC_ARG_WITH([group-prefix], group_masterd="${withval}masterd"; group_noded="$group_default"; group_daemons="${withval}daemons"; - group_mond="${withval}mond"], + group_mond="$group_default"], [group_rapi="$group_default"; group_admin="$group_default"; group_confd="$group_default"; @@ -566,6 +566,8 @@ if test "$enable_monitoring" != no; then [MONITORING_PKG="$MONITORING_PKG attoparsec"]) AC_GHC_PKG_CHECK([snap-server], [], [MONITORING_PKG="$MONITORING_PKG snap-server"]) + AC_GHC_PKG_CHECK([process], [], + [MONITORING_PKG="$MONITORING_PKG process"]) MONITORING_DEP= if test "$has_confd" = False; then MONITORING_DEP="$MONITORING_DEP confd" @@ -615,6 +617,8 @@ AC_GHC_PKG_CHECK([temporary], [], [HS_NODEV=1]) # of the checks. AC_GHC_PKG_CHECK([attoparsec], [], [HS_NODEV=1]) AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1]) +AC_GHC_PKG_CHECK([process], [], + [MONITORING_PKG="$MONITORING_PKG process"]) if test -n "$HS_NODEV"; then AC_MSG_WARN(m4_normalize([Required development modules were not found, you won't be able to run Haskell unittests])) @@ -777,6 +781,7 @@ AC_PYTHON_MODULE(pycurl, t) AC_PYTHON_MODULE(bitarray, t) AC_PYTHON_MODULE(ipaddr, t) AC_PYTHON_MODULE(yaml, t) +AC_PYTHON_MODULE(mock) AC_PYTHON_MODULE(affinity) AC_PYTHON_MODULE(paramiko)