[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
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)
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)
[ (default is 1)]
)],
[lvm_stripecount="$withval"],
- [lvm_stripecount="1"])
+ [lvm_stripecount=1])
AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount)
# --with-ssh-login-user=...
# --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
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],
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], [])
# 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
+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
+ 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
# extra modules for confd functionality
HTOOLS_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=],
[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
- 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
+if test "$has_confd" = True; then
AC_MSG_NOTICE([Enabling confd usage])
fi
AC_SUBST(ENABLE_CONFD, $has_confd)
#extra modules for monitoring agent functionality
has_monitoring=False
-if test "$enable_monitoring" != "no"; then
+if test "$enable_monitoring" != no; then
MONITORING_PKG=
- AC_GHC_PKG_CHECK([attoparsec], [], [MONITORING_PKG="$MONITORING_PKG attoparsec"])
+ 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
- if 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
+ 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
+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 x$has_monitoring = xTrue])
+AM_CONDITIONAL([ENABLE_MONITORING], [test "$has_monitoring" = True])
# development modules
HTOOLS_NODEV=
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])
+AC_GHC_PKG_CHECK([temporary], [], [HTOOLS_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], [], [HTOOLS_NODEV=1])
+AC_GHC_PKG_CHECK([vector], [], [HTOOLS_NODEV=1])
if test -n "$HTOOLS_NODEV"; then
AC_MSG_WARN(m4_normalize([Required development modules were not found,
you won't be able to run Haskell unittests]))
AC_MSG_WARN(m4_normalize([haddock not found, htools API documentation will
not be generated]))
fi
-if test "$HADDOCK" && test "$HSCOLOUR"; then
+if test -n "$HADDOCK" && test -n "$HSCOLOUR"; then
HTOOLS_APIDOC=yes
fi
AC_SUBST(HTOOLS_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_HTOOLS], [test "$HTOOLS" = yes])
AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$HTOOLS_NODEV" = x])
-AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes])
+AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test "$HTOOLS_APIDOC" = yes])
AM_CONDITIONAL([HAS_HLINT], [test "$HLINT"])
# Check for fakeroot
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)
AC_PYTHON_MODULE(paramiko)
projects / ganeti-local / blobdiff