X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/f9a51a213d304140368a7c5b2c4c7d822eedf5b9..1b68f268335999a5df4bf74a25a395aba9d603e7:/configure.ac diff --git a/configure.ac b/configure.ac index 3d7eaa3..0683f5f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ # Configure script for Ganeti m4_define([gnt_version_major], [2]) -m4_define([gnt_version_minor], [6]) -m4_define([gnt_version_revision], [1]) -m4_define([gnt_version_suffix], []) +m4_define([gnt_version_minor], [7]) +m4_define([gnt_version_revision], [0]) +m4_define([gnt_version_suffix], [~beta1]) m4_define([gnt_version_full], m4_format([%d.%d.%d%s], gnt_version_major, gnt_version_minor, @@ -49,6 +49,15 @@ AC_ARG_WITH([ssh-config-dir], [ssh_config_dir="/etc/ssh"]) AC_SUBST(SSH_CONFIG_DIR, $ssh_config_dir) +# --with-xen-config-dir=... +AC_ARG_WITH([xen-config-dir], + [AS_HELP_STRING([--with-xen-config-dir=DIR], + m4_normalize([Xen configuration directory + (default: /etc/xen)]))], + [xen_config_dir="$withval"], + [xen_config_dir=/etc/xen]) +AC_SUBST(XEN_CONFIG_DIR, $xen_config_dir) + # --with-os-search-path=... # do a bit of black sed magic to for quoting of the strings in the list AC_ARG_WITH([os-search-path], @@ -60,6 +69,18 @@ AC_ARG_WITH([os-search-path], [os_search_path="'/srv/ganeti/os'"]) AC_SUBST(OS_SEARCH_PATH, $os_search_path) +# --with-extstorage-search-path=... +# same black sed magic for quoting of the strings in the list +AC_ARG_WITH([extstorage-search-path], + [AS_HELP_STRING([--with-extstorage-search-path=LIST], + [comma separated list of directories to] + [ search for External Storage Providers] + [ (default is /srv/ganeti/extstorage)] + )], + [es_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/'\1'/g"`], + [es_search_path="'/srv/ganeti/extstorage'"]) +AC_SUBST(ES_SEARCH_PATH, $es_search_path) + # --with-iallocator-search-path=... # do a bit of black sed magic to for quoting of the strings in the list AC_ARG_WITH([iallocator-search-path], @@ -104,7 +125,7 @@ AC_ARG_WITH([xen-cmd], [Sets the xen cli interface command (default is xm)] )], [xen_cmd="$withval"], - [xen_cmd="xm"]) + [xen_cmd=xm]) AC_SUBST(XEN_CMD, $xen_cmd) if ! test "$XEN_CMD" = xl -o "$XEN_CMD" = xm; then @@ -134,7 +155,7 @@ AC_ARG_WITH([file-storage-dir], fi ]], [[file_storage_dir="/srv/ganeti/file-storage"; - enable_file_storage="True"]]) + enable_file_storage=True]]) AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir) AC_SUBST(ENABLE_FILE_STORAGE, $enable_file_storage) @@ -152,7 +173,7 @@ AC_ARG_WITH([shared-file-storage-dir], fi ]], [[shared_file_storage_dir="/srv/ganeti/shared-file-storage"; - enable_shared_file_storage="True"]]) + enable_shared_file_storage=True]]) AC_SUBST(SHARED_FILE_STORAGE_DIR, $shared_file_storage_dir) AC_SUBST(ENABLE_SHARED_FILE_STORAGE, $enable_shared_file_storage) @@ -173,7 +194,7 @@ AC_ARG_WITH([lvm-stripecount], [ (default is 1)] )], [lvm_stripecount="$withval"], - [lvm_stripecount="1"]) + [lvm_stripecount=1]) AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount) # --with-ssh-login-user=... @@ -268,7 +289,8 @@ AC_MSG_NOTICE([Group for clients is $group_admin]) # --enable-drbd-barriers AC_ARG_ENABLE([drbd-barriers], [AS_HELP_STRING([--enable-drbd-barriers], - [enable by default the DRBD barriers functionality (>= 8.0.12) (default: enabled)])], + m4_normalize([enable the DRBD barriers functionality by + default (>= 8.0.12) (default: enabled)]))], [[if test "$enableval" != no; then DRBD_BARRIERS=n DRBD_NO_META_FLUSH=False @@ -310,6 +332,19 @@ then fi AC_SUBST(SYSLOG_USAGE, $SYSLOG) +AC_ARG_ENABLE([restricted-commands], + [AS_HELP_STRING([--enable-restricted-commands], + m4_normalize([enable restricted commands in the node daemon + (default: disabled)]))], + [[if test "$enableval" = no; then + enable_restricted_commands=False + else + enable_restricted_commands=True + fi + ]], + [enable_restricted_commands=False]) +AC_SUBST(ENABLE_RESTRICTED_COMMANDS, $enable_restricted_commands) + # --with-disk-separator=... AC_ARG_WITH([disk-separator], [AS_HELP_STRING([--with-disk-separator=STRING], @@ -347,6 +382,38 @@ if test -z "$SPHINX" then AC_MSG_WARN(m4_normalize([sphinx-build not found, documentation rebuild will not be possible])) +else + # Sphinx exits with code 1 when it prints its usage + sphinxver=`{ $SPHINX --version 2>&1 || :; } | head -n 3` + + if ! echo "$sphinxver" | grep -q -w -e '^Sphinx' -e '^Usage:'; then + AC_MSG_ERROR([Unable to determine Sphinx version]) + + # Note: Character classes ([...]) need to be double quoted due to autoconf + # using m4 + elif ! echo "$sphinxver" | grep -q -E '^Sphinx[[[:space:]]]+v[[1-9]]\>'; then + AC_MSG_ERROR([Sphinx 1.0 or higher is required]) + fi +fi + +AC_ARG_ENABLE([manpages-in-doc], + [AS_HELP_STRING([--enable-manpages-in-doc], + m4_normalize([include man pages in HTML documentation + (requires sphinx; default disabled)]))], + [case "$enableval" in + yes) manpages_in_doc=yes ;; + no) manpages_in_doc= ;; + *) + AC_MSG_ERROR([Bad value $enableval for --enable-manpages-in-doc]) + ;; + esac + ], + [manpages_in_doc=]) +AM_CONDITIONAL([MANPAGES_IN_DOC], [test -n "$manpages_in_doc"]) +AC_SUBST(MANPAGES_IN_DOC, $manpages_in_doc) + +if test -z "$SPHINX" -a -n "$manpages_in_doc"; then + AC_MSG_ERROR([Including man pages in HTML documentation requires sphinx]) fi # Check for graphviz (dot) @@ -373,7 +440,16 @@ if test -z "$PEP8" then AC_MSG_WARN([pep8 not found, checking code will not be complete]) fi -AM_CONDITIONAL([HAS_PEP8], [test "$PEP8"]) +AM_CONDITIONAL([HAS_PEP8], [test -n "$PEP8"]) + +# Check for python-coverage +AC_ARG_VAR(PYCOVERAGE, [python-coverage path]) +AC_PATH_PROGS(PYCOVERAGE, [python-coverage coverage], []) +if test -z "$PYCOVERAGE" +then + AC_MSG_WARN(m4_normalize([python-coverage or coverage not found, evaluating + Python test coverage will not be possible])) +fi # Check for socat AC_ARG_VAR(SOCAT, [socat path]) @@ -407,6 +483,13 @@ AC_ARG_ENABLE([confd], [], [enable_confd=check]) +ENABLE_MONITORING= +AC_ARG_ENABLE([monitoring], + [AS_HELP_STRING([--enable-monitoring], + [enable the ganeti monitoring agent (default: check)])], + [], + [enable_monitoring=check]) + # Check for ghc AC_ARG_VAR(GHC, [ghc path]) AC_PATH_PROG(GHC, [ghc], []) @@ -414,6 +497,17 @@ if test -z "$GHC"; then AC_MSG_FAILURE([ghc not found, compilation will not possible]) fi +AC_MSG_CHECKING([checking for extra GHC flags]) +GHC_BYVERSION_FLAGS= +# check for GHC supported flags that vary accross versions +for flag in -fwarn-incomplete-uni-patterns; do + if $GHC -e '0' $flag >/dev/null 2>/dev/null; then + GHC_BYVERSION_FLAGS="$GHC_BYVERSION_FLAGS $flag" + fi +done +AC_MSG_RESULT($GHC_BYVERSION_FLAGS) +AC_SUBST(GHC_BYVERSION_FLAGS) + # Check for ghc-pkg AC_ARG_VAR(GHC_PKG, [ghc-pkg path]) AC_PATH_PROG(GHC_PKG, [ghc-pkg], []) @@ -423,11 +517,11 @@ fi # check for modules, first custom/special checks AC_MSG_NOTICE([checking for required haskell modules]) -HTOOLS_NOCURL=-DNO_CURL -if test "$enable_htools_rapi" != "no"; then - AC_GHC_PKG_CHECK([curl], [HTOOLS_NOCURL=], []) - if test -n "$HTOOLS_NOCURL"; then - if test "$enable_htools_rapi" = "check"; then +HS_NOCURL=-DNO_CURL +if test "$enable_htools_rapi" != no; then + AC_GHC_PKG_CHECK([curl], [HS_NOCURL=], []) + if test -n "$HS_NOCURL"; then + if test "$enable_htools_rapi" = check; then AC_MSG_WARN(m4_normalize([The curl library was not found, Haskell code will be compiled without RAPI support])) else @@ -438,12 +532,12 @@ if test "$enable_htools_rapi" != "no"; then AC_MSG_NOTICE([Enabling curl/RAPI/RPC usage in Haskell code]) fi fi -AC_SUBST(HTOOLS_NOCURL) +AC_SUBST(HS_NOCURL) -HTOOLS_PARALLEL3= -AC_GHC_PKG_CHECK([parallel-3.*], [HTOOLS_PARALLEL3=-DPARALLEL3], +HS_PARALLEL3= +AC_GHC_PKG_CHECK([parallel-3.*], [HS_PARALLEL3=-DPARALLEL3], [AC_GHC_PKG_REQUIRE(parallel)], t) -AC_SUBST(HTOOLS_PARALLEL3) +AC_SUBST(HS_PARALLEL3) # and now standard modules AC_GHC_PKG_REQUIRE(json) @@ -453,49 +547,78 @@ AC_GHC_PKG_REQUIRE(bytestring) AC_GHC_PKG_REQUIRE(utf8-string) # extra modules for confd functionality -HTOOLS_REGEX_PCRE=-DNO_REGEX_PCRE +HS_REGEX_PCRE=-DNO_REGEX_PCRE has_confd=False -if test "$enable_confd" != "no"; then +if test "$enable_confd" != no; then CONFD_PKG= - AC_GHC_PKG_CHECK([regex-pcre], [HTOOLS_REGEX_PCRE=], + AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=], [CONFD_PKG="$CONFD_PKG regex-pcre"]) AC_GHC_PKG_CHECK([hslogger], [], [CONFD_PKG="$CONFD_PKG hslogger"]) AC_GHC_PKG_CHECK([Crypto], [], [CONFD_PKG="$CONFD_PKG Crypto"]) AC_GHC_PKG_CHECK([text], [], [CONFD_PKG="$CONFD_PKG text"]) AC_GHC_PKG_CHECK([hinotify], [], [CONFD_PKG="$CONFD_PKG hinotify"]) + AC_GHC_PKG_CHECK([vector], [], [CONFD_PKG="$CONFD_PKG vector"]) if test -z "$CONFD_PKG"; then has_confd=True + elif test "$enable_confd" = check; then + AC_MSG_WARN(m4_normalize([The required extra libraries for confd were + not found ($CONFD_PKG), confd disabled])) else - if test "$enable_confd" = "check"; then - AC_MSG_WARN(m4_normalize([The required extra libraries for confd were - not found ($CONFD_PKG), confd disabled])) - else - AC_MSG_FAILURE(m4_normalize([The confd functionality was requested, but - required libraries were not found: - $CONFD_PKG])) - fi + AC_MSG_FAILURE(m4_normalize([The confd functionality was requested, but + required libraries were not found: + $CONFD_PKG])) fi fi -AC_SUBST(HTOOLS_REGEX_PCRE) -if test "$has_confd" = "True"; then +AC_SUBST(HS_REGEX_PCRE) +if test "$has_confd" = True; then AC_MSG_NOTICE([Enabling confd usage]) fi AC_SUBST(ENABLE_CONFD, $has_confd) AM_CONDITIONAL([ENABLE_CONFD], [test x$has_confd = xTrue]) +#extra modules for monitoring agent functionality +has_monitoring=False +if test "$enable_monitoring" != no; then + MONITORING_PKG= + AC_GHC_PKG_CHECK([attoparsec], [], + [MONITORING_PKG="$MONITORING_PKG attoparsec"]) + if test -z "$MONITORING_PKG"; then + has_monitoring=True + elif test "$enable_monitoring" = check; then + AC_MSG_WARN(m4_normalize([The required extra libraries for the monitoring + agent were not found ($MONITORING_PKG), + monitoring disabled])) + else + AC_MSG_FAILURE(m4_normalize([The monitoring functionality was requested, but + required libraries were not found: + $MONITORING_PKG])) + fi +fi +if test "$has_monitoring" = True; then + AC_MSG_NOTICE([Enabling the monitoring agent usage]) +fi +AC_SUBST(ENABLE_MONITORING, $has_monitoring) +AM_CONDITIONAL([ENABLE_MONITORING], [test "$has_monitoring" = True]) + # development modules -HTOOLS_NODEV= -AC_GHC_PKG_CHECK([QuickCheck-2.*], [], [HTOOLS_NODEV=1], t) -AC_GHC_PKG_CHECK([test-framework-0.6*], [], [HTOOLS_NODEV=1], t) -AC_GHC_PKG_CHECK([test-framework-hunit], [], [HTOOLS_NODEV=1]) -AC_GHC_PKG_CHECK([test-framework-quickcheck2], [], [HTOOLS_NODEV=1]) -if test -n "$HTOOLS_NODEV"; then +HS_NODEV= +AC_GHC_PKG_CHECK([QuickCheck-2.*], [], [HS_NODEV=1], t) +AC_GHC_PKG_CHECK([test-framework-0.6*], [], [HS_NODEV=1], t) +AC_GHC_PKG_CHECK([test-framework-hunit], [], [HS_NODEV=1]) +AC_GHC_PKG_CHECK([test-framework-quickcheck2], [], [HS_NODEV=1]) +AC_GHC_PKG_CHECK([temporary], [], [HS_NODEV=1]) +# FIXME: unify checks for non-test libraries (attoparsec, hinotify, ...) +# that are needed to execute the tests, avoiding the duplication +# of the checks. +AC_GHC_PKG_CHECK([attoparsec], [], [HS_NODEV=1]) +AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1]) +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])) else AC_MSG_NOTICE([Haskell development modules found, unittests enabled]) fi -AC_SUBST(HTOOLS_NODEV) +AC_SUBST(HS_NODEV) HTOOLS=yes AC_SUBST(HTOOLS) @@ -518,7 +641,7 @@ AC_ARG_ENABLE([split-query], ;; esac ]], - [[case "x${has_confd}x${HTOOLS_NOCURL}x" in + [[case "x${has_confd}x${HS_NOCURL}x" in xTruexx) enable_split_query=True ;; @@ -532,7 +655,7 @@ if test x$enable_split_query = xTrue -a x$has_confd != xTrue; then AC_MSG_ERROR([Split queries require the confd daemon]) fi -if test x$enable_split_query = xTrue -a x$HTOOLS_NOCURL != x; then +if test x$enable_split_query = xTrue -a x$HS_NOCURL != x; then AC_MSG_ERROR([Split queries require the htools-rapi feature (curl library)]) fi @@ -541,7 +664,7 @@ if test x$enable_split_query = xTrue; then fi # Check for HsColour -HTOOLS_APIDOC=no +HS_APIDOC=no AC_ARG_VAR(HSCOLOUR, [HsColour path]) AC_PATH_PROG(HSCOLOUR, [HsColour], []) if test -z "$HSCOLOUR"; then @@ -556,27 +679,26 @@ if test -z "$HADDOCK"; then AC_MSG_WARN(m4_normalize([haddock not found, htools API documentation will not be generated])) fi -if test "$HADDOCK" && test "$HSCOLOUR"; then - HTOOLS_APIDOC=yes +if test -n "$HADDOCK" && test -n "$HSCOLOUR"; then + HS_APIDOC=yes fi -AC_SUBST(HTOOLS_APIDOC) +AC_SUBST(HS_APIDOC) # Check for hlint -HLINT=no AC_ARG_VAR(HLINT, [hlint path]) AC_PATH_PROG(HLINT, [hlint], []) if test -z "$HLINT"; then AC_MSG_WARN([hlint not found, checking code will not be possible]) fi -if test "$HTOOLS" != "yes" && test "$ENABLE_CONFD" = "True"; then - AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if - htools support is not enabled])) +if test "$HTOOLS" != yes && test "$ENABLE_CONFD" = True; then + AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if + htools support is not enabled])) fi -AM_CONDITIONAL([WANT_HTOOLS], [test x$HTOOLS = xyes]) -AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$HTOOLS_NODEV" = x]) -AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes]) +AM_CONDITIONAL([WANT_HTOOLS], [test "$HTOOLS" = yes]) +AM_CONDITIONAL([WANT_HSTESTS], [test "x$HS_NODEV" = x]) +AM_CONDITIONAL([WANT_HSAPIDOC], [test "$HS_APIDOC" = yes]) AM_CONDITIONAL([HAS_HLINT], [test "$HLINT"]) # Check for fakeroot @@ -653,15 +775,10 @@ AC_PYTHON_MODULE(simplejson, t) AC_PYTHON_MODULE(pyparsing, t) AC_PYTHON_MODULE(pyinotify, t) AC_PYTHON_MODULE(pycurl, t) +AC_PYTHON_MODULE(bitarray, t) +AC_PYTHON_MODULE(ipaddr, t) AC_PYTHON_MODULE(affinity) - -# This is optional but then we've limited functionality AC_PYTHON_MODULE(paramiko) -if test "$HAVE_PYMOD_PARAMIKO" = "no"; then - AC_MSG_WARN(m4_normalize([You do not have Paramiko installed. While this is - optional you have to configure SSH and the node - daemon on the joining nodes yourself.])) -fi AC_CONFIG_FILES([ Makefile ])