X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/ebcbcfee086692716fbf975690278b5506a8141f..8451bfdbe97085f9872e35273cbe1a452e0c3370:/configure.ac diff --git a/configure.ac b/configure.ac index 34703b4..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], [7]) +m4_define([gnt_version_minor], [9]) m4_define([gnt_version_revision], [0]) -m4_define([gnt_version_suffix], [~beta3]) +m4_define([gnt_version_suffix], [~rc1]) m4_define([gnt_version_full], m4_format([%d.%d.%d%s], gnt_version_major, gnt_version_minor, @@ -119,19 +119,6 @@ AC_ARG_WITH([xen-initrd], [xen_initrd="/boot/initrd-3-xenU"]) AC_SUBST(XEN_INITRD, $xen_initrd) -# --with-xen-cmd=... -AC_ARG_WITH([xen-cmd], - [AS_HELP_STRING([--with-xen-cmd=CMD], - [Sets the xen cli interface command (default is xm)] - )], - [xen_cmd="$withval"], - [xen_cmd=xm]) -AC_SUBST(XEN_CMD, $xen_cmd) - -if ! test "$XEN_CMD" = xl -o "$XEN_CMD" = xm; then - AC_MSG_ERROR([Unsupported xen command specified]) -fi - # --with-kvm-kernel=... AC_ARG_WITH([kvm-kernel], [AS_HELP_STRING([--with-kvm-kernel=PATH], @@ -141,41 +128,14 @@ AC_ARG_WITH([kvm-kernel], [kvm_kernel="/boot/vmlinuz-3-kvmU"]) AC_SUBST(KVM_KERNEL, $kvm_kernel) -# --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)] - )], - [[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) - # --with-shared-file-storage-dir=... AC_ARG_WITH([shared-file-storage-dir], [AS_HELP_STRING([--with-shared-file-storage-dir=PATH], [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], @@ -243,16 +203,19 @@ AC_ARG_WITH([user-prefix], [user_masterd="${withval}masterd"; user_rapi="${withval}rapi"; user_confd="${withval}confd"; + 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) @@ -266,6 +229,7 @@ AC_ARG_WITH([group-prefix], [group_rapi="${withval}rapi"; group_admin="${withval}admin"; group_confd="${withval}confd"; + group_luxid="${withval}luxid"; group_masterd="${withval}masterd"; group_noded="$group_default"; group_daemons="${withval}daemons"; @@ -273,6 +237,7 @@ AC_ARG_WITH([group-prefix], [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"; @@ -280,6 +245,7 @@ AC_ARG_WITH([group-prefix], 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) @@ -289,6 +255,7 @@ AC_SUBST(MOND_GROUP, $group_mond) 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]) @@ -401,6 +368,7 @@ else 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], @@ -527,6 +495,7 @@ 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 @@ -535,7 +504,6 @@ 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([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"]) @@ -780,11 +748,26 @@ AC_PYTHON_MODULE(pyinotify, t) 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) +# 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 ]) AC_OUTPUT