X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/18e2d06539427d0d8417d69b89279b2be654534d..8451bfdbe97085f9872e35273cbe1a452e0c3370:/configure.ac diff --git a/configure.ac b/configure.ac index 3b49bbf..d37965b 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], [5]) +m4_define([gnt_version_minor], [9]) m4_define([gnt_version_revision], [0]) -m4_define([gnt_version_suffix], [~rc6]) +m4_define([gnt_version_suffix], [~rc1]) 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], @@ -83,38 +104,29 @@ AC_SUBST(XEN_BOOTLOADER, $xen_bootloader) # --with-xen-kernel=... AC_ARG_WITH([xen-kernel], [AS_HELP_STRING([--with-xen-kernel=PATH], - [DomU kernel image for Xen hypervisor (default is /boot/vmlinuz-2.6-xenU)] + [DomU kernel image for Xen hypervisor (default is /boot/vmlinuz-3-xenU)] )], [xen_kernel="$withval"], - [xen_kernel="/boot/vmlinuz-2.6-xenU"]) + [xen_kernel="/boot/vmlinuz-3-xenU"]) AC_SUBST(XEN_KERNEL, $xen_kernel) # --with-xen-initrd=... AC_ARG_WITH([xen-initrd], [AS_HELP_STRING([--with-xen-initrd=PATH], - [DomU initrd image for Xen hypervisor (default is /boot/initrd-2.6-xenU)] + [DomU initrd image for Xen hypervisor (default is /boot/initrd-3-xenU)] )], [xen_initrd="$withval"], - [xen_initrd="/boot/initrd-2.6-xenU"]) + [xen_initrd="/boot/initrd-3-xenU"]) AC_SUBST(XEN_INITRD, $xen_initrd) -# --with-file-storage-dir=... -AC_ARG_WITH([file-storage-dir], - [AS_HELP_STRING([--with-file-storage-dir=PATH], - [directory to store files for file-based backend] - [ (default is /srv/ganeti/file-storage)] +# --with-kvm-kernel=... +AC_ARG_WITH([kvm-kernel], + [AS_HELP_STRING([--with-kvm-kernel=PATH], + [Guest kernel image for KVM hypervisor (default is /boot/vmlinuz-3-kvmU)] )], - [[file_storage_dir="$withval"; - if test "$withval" != no; then - enable_file_storage=True - else - enable_file_storage=False - fi - ]], - [[file_storage_dir="/srv/ganeti/file-storage"; - enable_file_storage="True"]]) -AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir) -AC_SUBST(ENABLE_FILE_STORAGE, $enable_file_storage) + [kvm_kernel="$withval"], + [kvm_kernel="/boot/vmlinuz-3-kvmU"]) +AC_SUBST(KVM_KERNEL, $kvm_kernel) # --with-shared-file-storage-dir=... AC_ARG_WITH([shared-file-storage-dir], @@ -122,17 +134,8 @@ AC_ARG_WITH([shared-file-storage-dir], [directory to store files for shared file-based backend] [ (default is /srv/ganeti/shared-file-storage)] )], - [[shared_file_storage_dir="$withval"; - if test "$withval" != no; then - enable_shared_file_storage=True - else - enable_shared_file_storage=False - fi - ]], - [[shared_file_storage_dir="/srv/ganeti/shared-file-storage"; - enable_shared_file_storage="True"]]) + [[shared_file_storage_dir="/srv/ganeti/shared-file-storage"]]) AC_SUBST(SHARED_FILE_STORAGE_DIR, $shared_file_storage_dir) -AC_SUBST(ENABLE_SHARED_FILE_STORAGE, $enable_shared_file_storage) # --with-kvm-path=... AC_ARG_WITH([kvm-path], @@ -147,76 +150,133 @@ AC_SUBST(KVM_PATH, $kvm_path) # --with-lvm-stripecount=... AC_ARG_WITH([lvm-stripecount], [AS_HELP_STRING([--with-lvm-stripecount=NUM], - [the number of stripes to use for LVM volumes] + [the default number of stripes to use for LVM volumes] [ (default is 1)] )], [lvm_stripecount="$withval"], - [lvm_stripecount="1"]) + [lvm_stripecount=1]) AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount) +# --with-ssh-login-user=... +AC_ARG_WITH([ssh-login-user], + [AS_HELP_STRING([--with-ssh-login-user=USERNAME], + [user to use for SSH logins within the cluster (default is root)] + )], + [ssh_login_user="$withval"], + [ssh_login_user=root]) +AC_SUBST(SSH_LOGIN_USER, $ssh_login_user) + +# --with-ssh-console-user=... +AC_ARG_WITH([ssh-console-user], + [AS_HELP_STRING([--with-ssh-console-user=USERNAME], + [user to use for SSH logins to access instance consoles (default is root)] + )], + [ssh_console_user="$withval"], + [ssh_console_user=root]) +AC_SUBST(SSH_CONSOLE_USER, $ssh_console_user) + +# --with-default-user=... +AC_ARG_WITH([default-user], + [AS_HELP_STRING([--with-default-user=USERNAME], + [default user for daemons] + [ (default is to run all daemons as root)] + )], + [user_default="$withval"], + [user_default=root]) + +# --with-default-group=... +AC_ARG_WITH([default-group], + [AS_HELP_STRING([--with-default-group=GROUPNAME], + [default group for daemons] + [ (default is to run all daemons under group root)] + )], + [group_default="$withval"], + [group_default=root]) + # --with-user-prefix=... AC_ARG_WITH([user-prefix], [AS_HELP_STRING([--with-user-prefix=PREFIX], [prefix for daemon users] - [ (default is to run all daemons as root)] + [ (default is to run all daemons as root; use --with-default-user] + [ to change the default)] )], [user_masterd="${withval}masterd"; user_rapi="${withval}rapi"; user_confd="${withval}confd"; - user_noded="root"], - [user_masterd="root"; - user_rapi="root"; - user_confd="root"; - user_noded="root"]) + user_luxid="${withval}luxid"; + user_noded="$user_default"; + user_mond="$user_default"], + [user_masterd="$user_default"; + user_rapi="$user_default"; + user_confd="$user_default"; + user_luxid="$user_default"; + user_noded="$user_default"; + user_mond="$user_default"]) AC_SUBST(MASTERD_USER, $user_masterd) AC_SUBST(RAPI_USER, $user_rapi) AC_SUBST(CONFD_USER, $user_confd) +AC_SUBST(LUXID_USER, $user_luxid) AC_SUBST(NODED_USER, $user_noded) +AC_SUBST(MOND_USER, $user_mond) # --with-group-prefix=... AC_ARG_WITH([group-prefix], [AS_HELP_STRING([--with-group-prefix=PREFIX], [prefix for daemon POSIX groups] - [ (default is to run all daemons under group root)] + [ (default is to run all daemons under group root; use] + [ --with-default-group to change the default)] )], [group_rapi="${withval}rapi"; group_admin="${withval}admin"; group_confd="${withval}confd"; + group_luxid="${withval}luxid"; group_masterd="${withval}masterd"; - group_noded="root"; - group_daemons="${withval}daemons";], - [group_rapi="root"; - group_admin="root"; - group_confd="root"; - group_masterd="root"; - group_noded="root"; - group_daemons="root"]) + group_noded="$group_default"; + group_daemons="${withval}daemons"; + group_mond="$group_default"], + [group_rapi="$group_default"; + group_admin="$group_default"; + group_confd="$group_default"; + group_luxid="$group_default"; + group_masterd="$group_default"; + group_noded="$group_default"; + group_daemons="$group_default"; + group_mond="$group_default"]) AC_SUBST(RAPI_GROUP, $group_rapi) AC_SUBST(ADMIN_GROUP, $group_admin) AC_SUBST(CONFD_GROUP, $group_confd) +AC_SUBST(LUXID_GROUP, $group_luxid) AC_SUBST(MASTERD_GROUP, $group_masterd) AC_SUBST(NODED_GROUP, $group_noded) AC_SUBST(DAEMONS_GROUP, $group_daemons) +AC_SUBST(MOND_GROUP, $group_mond) # Print the config to the user AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd]) AC_MSG_NOTICE([Running ganeti-rapi as $user_rapi:$group_rapi]) AC_MSG_NOTICE([Running ganeti-confd as $user_confd:$group_confd]) +AC_MSG_NOTICE([Running ganeti-luxid as $user_luxid:$group_luxid]) AC_MSG_NOTICE([Group for daemons is $group_daemons]) AC_MSG_NOTICE([Group for clients is $group_admin]) # --enable-drbd-barriers AC_ARG_ENABLE([drbd-barriers], [AS_HELP_STRING([--enable-drbd-barriers], - [enable the DRBD barrier 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=True + DRBD_BARRIERS=n + DRBD_NO_META_FLUSH=False else - DRBD_BARRIERS=False + DRBD_BARRIERS=bf + DRBD_NO_META_FLUSH=True fi ]], - [DRBD_BARRIERS=True]) + [DRBD_BARRIERS=n + DRBD_NO_META_FLUSH=False + ]) AC_SUBST(DRBD_BARRIERS, $DRBD_BARRIERS) +AC_SUBST(DRBD_NO_META_FLUSH, $DRBD_NO_META_FLUSH) # --enable-syslog[=no/yes/only] AC_ARG_ENABLE([syslog], @@ -245,21 +305,18 @@ then fi AC_SUBST(SYSLOG_USAGE, $SYSLOG) -# --enable-htools -HTOOLS= -AC_ARG_ENABLE([htools], - [AS_HELP_STRING([--enable-htools], - [enable use of htools (needs GHC and libraries, default: check)])], - [], - [enable_htools=check]) - -# --enable-htools-rapi -HTOOLS_RAPI= -AC_ARG_ENABLE([htools-rapi], - [AS_HELP_STRING([--enable-htools-rapi], - [enable use of RAPI in htools (needs curl, default: no)])], - [], - [enable_htools_rapi=no]) +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], @@ -298,6 +355,39 @@ 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 +AM_CONDITIONAL([HAS_SPHINX], [test -n "$SPHINX"]) + +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) @@ -324,6 +414,16 @@ if test -z "$PEP8" then AC_MSG_WARN([pep8 not found, checking code will not be complete]) fi +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]) @@ -333,101 +433,209 @@ then AC_MSG_ERROR([socat not found]) fi -if test "$enable_htools" != "no"; then +# Check for qemu-img +AC_ARG_VAR(QEMUIMG_PATH, [qemu-img path]) +AC_PATH_PROG(QEMUIMG_PATH, [qemu-img], []) +if test -z "$QEMUIMG_PATH" +then + AC_MSG_WARN([qemu-img not found, using ovfconverter will not be possible]) +fi + +# --enable-confd +ENABLE_CONFD= +AC_ARG_ENABLE([confd], + [AS_HELP_STRING([--enable-confd], + [enable the ganeti-confd daemon (default: check)])], + [], + [enable_confd=check]) + +ENABLE_MOND= +AC_ARG_ENABLE([monitoring], + [AS_HELP_STRING([--enable-monitoring], + [enable the ganeti monitoring daemon (default: check)])], + [], + [enable_monitoring=check]) # Check for ghc AC_ARG_VAR(GHC, [ghc path]) AC_PATH_PROG(GHC, [ghc], []) if test -z "$GHC"; then - if test "$enable_htools" != "check"; then - AC_MSG_FAILURE([ghc not found, htools compilation will not possible]) - fi + 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 -HTOOLS_MODULES= AC_ARG_VAR(GHC_PKG, [ghc-pkg path]) AC_PATH_PROG(GHC_PKG, [ghc-pkg], []) if test -z "$GHC_PKG"; then - if test "$enable_htools" != "check"; then - AC_MSG_FAILURE([ghc-pkg not found, htools compilation will not be possible]) - fi -else - # check for modules - AC_MSG_NOTICE([checking for required haskell modules]) - HTOOLS_NOCURL=-DNO_CURL - if test "$enable_htools_rapi" != "no"; then - AC_MSG_CHECKING([curl]) - GHC_PKG_CURL=$($GHC_PKG latest curl) - if test -z "$GHC_PKG_CURL"; then - if test "$enable_htools_rapi" = "check"; then - AC_MSG_WARN(m4_normalize([The curl library not found, htools will be - compiled without RAPI support])) - else - AC_MSG_FAILURE(m4_normalize([The curl library was not found, but it has - been requested])) - fi - else - HTOOLS_NOCURL= - fi - AC_MSG_RESULT($GHC_PKG_CURL) - fi - AC_SUBST(GHC_PKG_CURL) - AC_SUBST(HTOOLS_NOCURL) - AC_MSG_CHECKING([parallel]) - GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-3.*') - if test -n "$GHC_PKG_PARALLEL" - then - HTOOLS_PARALLEL3=-DPARALLEL3 + AC_MSG_FAILURE([ghc-pkg not found, compilation will not be possible]) +fi + +# check for modules, first custom/special checks +AC_MSG_NOTICE([checking for required haskell modules]) +HS_PARALLEL3= +AC_GHC_PKG_CHECK([parallel-3.*], [HS_PARALLEL3=-DPARALLEL3], + [AC_GHC_PKG_REQUIRE(parallel)], t) +AC_SUBST(HS_PARALLEL3) + +# and now standard modules +AC_GHC_PKG_REQUIRE(curl) +AC_GHC_PKG_REQUIRE(json) +AC_GHC_PKG_REQUIRE(network) +AC_GHC_PKG_REQUIRE(mtl) +AC_GHC_PKG_REQUIRE(bytestring) +AC_GHC_PKG_REQUIRE(utf8-string) +AC_GHC_PKG_REQUIRE(hslogger) + +# extra modules for confd functionality +HS_REGEX_PCRE=-DNO_REGEX_PCRE +has_confd=False +if test "$enable_confd" != no; then + CONFD_PKG= + AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=], + [CONFD_PKG="$CONFD_PKG regex-pcre"]) + 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 - GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-2.*') + AC_MSG_FAILURE(m4_normalize([The confd functionality was requested, but + required libraries were not found: + $CONFD_PKG])) fi - if test -z "$GHC_PKG_PARALLEL" - then - GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-1.*') +fi +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 daemon functionality +has_monitoring=False +if test "$enable_monitoring" != no; then + MONITORING_PKG= + AC_GHC_PKG_CHECK([attoparsec], [], + [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" fi - AC_SUBST(GHC_PKG_PARALLEL) - AC_SUBST(HTOOLS_PARALLEL3) - AC_MSG_RESULT($GHC_PKG_PARALLEL) - AC_MSG_CHECKING([json]) - GHC_PKG_JSON=$($GHC_PKG latest json) - AC_MSG_RESULT($GHC_PKG_JSON) - AC_MSG_CHECKING([network]) - GHC_PKG_NETWORK=$($GHC_PKG latest network) - AC_MSG_RESULT($GHC_PKG_NETWORK) - AC_MSG_CHECKING([QuickCheck 2.x]) - GHC_PKG_QUICKCHECK=$($GHC_PKG --simple-output list 'QuickCheck-2.*') - AC_MSG_RESULT($GHC_PKG_QUICKCHECK) - if test -z "$GHC_PKG_PARALLEL" || test -z "$GHC_PKG_JSON" || \ - test -z "$GHC_PKG_NETWORK"; then - if test "$enable_htools" != "check"; then - AC_MSG_FAILURE(m4_normalize([Required Haskell modules not found, htools - compilation disabled])) - fi + has_monitoring_pkg=False + if test -z "$MONITORING_PKG"; then + has_monitoring_pkg=True + elif test "$enable_monitoring" = check; then + AC_MSG_WARN(m4_normalize([The required extra libraries for the monitoring + daemon were not found ($MONITORING_PKG), + monitoring disabled])) else - # we leave the other modules to be auto-selected - HTOOLS_MODULES="-package $GHC_PKG_PARALLEL" + AC_MSG_FAILURE(m4_normalize([The monitoring functionality was requested, but + required libraries were not found: + $MONITORING_PKG])) fi - if test -z "$GHC_PKG_QUICKCHECK"; then - AC_MSG_WARN(m4_normalize([The QuickCheck 2.x module was not found, - you won't be able to run Haskell unittests])) - fi -fi -AC_SUBST(HTOOLS_MODULES) -AC_SUBST(GHC_PKG_QUICKCHECK) - -if test "$enable_htools" != "no"; then - if test -z "$GHC" || test -z "$HTOOLS_MODULES"; then - AC_MSG_WARN(m4_normalize([Haskell compiler/required libraries not found, - htools compilation disabled])) + has_monitoring_dep=False + if test -z "$MONITORING_DEP"; then + has_monitoring_dep=True + elif test "$enable_monitoring" = check; then + AC_MSG_WARN(m4_normalize([The optional Ganeti components required for the + monitoring agent were not enabled + ($MONITORING_DEP), monitoring disabled])) else - HTOOLS=yes + AC_MSG_FAILURE(m4_normalize([The monitoring functionality was requested, but + required optional Ganeti components were not + found: $MONITORING_DEP])) fi + +fi +if test "$has_monitoring_pkg" = True -a "$has_monitoring_dep" = True; then + has_monitoring=True + AC_MSG_NOTICE([Enabling the monitoring agent usage]) fi +AC_SUBST(ENABLE_MOND, $has_monitoring) +AM_CONDITIONAL([ENABLE_MOND], [test "$has_monitoring" = True]) + +# development modules +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]) +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])) +else + AC_MSG_NOTICE([Haskell development modules found, unittests enabled]) +fi +AC_SUBST(HS_NODEV) + +HTOOLS=yes AC_SUBST(HTOOLS) +# --enable-split-query +ENABLE_SPLIT_QUERY= +AC_ARG_ENABLE([split-query], + [AS_HELP_STRING([--enable-split-query], + [enable use of custom query daemon via confd])], + [[case "$enableval" in + no) + enable_split_query=False + ;; + yes) + enable_split_query=True + ;; + *) + echo "Invalid value for enable-confd '$enableval'" + exit 1 + ;; + esac + ]], + [[case "x${has_confd}x" in + xTruex) + enable_split_query=True + ;; + *) + enable_split_query=False + ;; + esac]]) +AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query) + +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; then + AC_MSG_NOTICE([Split query functionality enabled]) +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 @@ -442,16 +650,36 @@ 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) -fi # end if enable_htools, define automake conditions +# Check for hlint +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 -AM_CONDITIONAL([WANT_HTOOLS], [test x$HTOOLS = xyes]) -AM_CONDITIONAL([WANT_HTOOLSTESTS], [test x$GHC_PKG_QUICKCHECK != x]) -AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes]) +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 "$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 +AC_ARG_VAR(FAKEROOT_PATH, [fakeroot path]) +AC_PATH_PROG(FAKEROOT_PATH, [fakeroot], []) +if test -z "$FAKEROOT_PATH"; then + AC_MSG_WARN(m4_normalize([fakeroot not found, tests that must run as root + will not be executed])) +fi +AM_CONDITIONAL([HAS_FAKEROOT], [test "x$FAKEROOT_PATH" != x]) SOCAT_USE_ESCAPE= AC_ARG_ENABLE([socat-escape], @@ -511,21 +739,34 @@ fi AC_SUBST(MAN_HAS_WARNINGS) # Check for Python -AM_PATH_PYTHON(2.4) +AM_PATH_PYTHON(2.6) AC_PYTHON_MODULE(OpenSSL, t) AC_PYTHON_MODULE(simplejson, t) AC_PYTHON_MODULE(pyparsing, t) AC_PYTHON_MODULE(pyinotify, t) AC_PYTHON_MODULE(pycurl, t) - -# This is optional but then we've limited functionality +AC_PYTHON_MODULE(bitarray, t) +AC_PYTHON_MODULE(ipaddr, t) +AC_PYTHON_MODULE(mock) +AC_PYTHON_MODULE(affinity) 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.])) + +# Development-only Python modules +PY_NODEV= +AC_PYTHON_MODULE(yaml) +if test $HAVE_PYMOD_YAML == "no"; then + PY_NODEV="$PY_NODEV yaml" +fi + +if test -n "$PY_NODEV"; then + AC_MSG_WARN(m4_normalize([Required development modules ($PY_NODEV) were not + found, you won't be able to run Python unittests])) +else + AC_MSG_NOTICE([Python development modules found, unittests enabled]) fi +AC_SUBST(PY_NODEV) +AM_CONDITIONAL([PY_UNIT], [test -n $PY_NODEV]) AC_CONFIG_FILES([ Makefile ])