configure: Add option to enable remote commands

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d3103ab..88f1369 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -208,6 +208,8 @@ BUILT_EXAMPLES = \
        doc/examples/ganeti-kvm-poweroff.initd \
        doc/examples/ganeti.cron \
        doc/examples/ganeti.initd \
+       doc/examples/ganeti-master-role.ocf \
+       doc/examples/ganeti-node-role.ocf \
        doc/examples/gnt-config-backup \
        doc/examples/hooks/ipsec
 
@@ -401,7 +403,12 @@ HS_ALL_PROGS = \
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
 HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=htest/%) htest/hail
 
-HFLAGS = -O -Wall -Werror -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
+HFLAGS = \
+       -O -Wall -Werror -ihtools \
+       -fwarn-monomorphism-restriction \
+       -fwarn-tabs \
+       $(GHC_BYVERSION_FLAGS)
+
 # extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
 HEXTRA =
 # internal extra flags (used for htest/test mainly)
@@ -422,8 +429,8 @@ HS_LIB_SRCS = \
        htools/Ganeti/BasicTypes.hs \
        htools/Ganeti/Common.hs \
        htools/Ganeti/Compat.hs \
-       htools/Ganeti/Confd.hs \
        htools/Ganeti/Confd/Server.hs \
+       htools/Ganeti/Confd/Types.hs \
        htools/Ganeti/Confd/Utils.hs \
        htools/Ganeti/Config.hs \
        htools/Ganeti/Daemon.hs \
@@ -473,6 +480,7 @@ HS_LIB_SRCS = \
        htools/Ganeti/Utils.hs
 
 HS_TEST_SRCS = \
+       htest/Test/Ganeti/Attoparsec.hs \
        htest/Test/Ganeti/BasicTypes.hs \
        htest/Test/Ganeti/Common.hs \
        htest/Test/Ganeti/Confd/Utils.hs \
@@ -931,6 +939,7 @@ python_tests = \
        test/ganeti.rpc_unittest.py \
        test/ganeti.runtime_unittest.py \
        test/ganeti.serializer_unittest.py \
+       test/ganeti.server.rapi_unittest.py \
        test/ganeti.ssh_unittest.py \
        test/ganeti.storage_unittest.py \
        test/ganeti.tools.ensure_dirs_unittest.py \
@@ -1155,11 +1164,14 @@ clean-vcs-version:
 
 .PHONY: regen-vcs-version
 regen-vcs-version:
-       set -e; \
+       @set -e; \
        cd $(srcdir); \
        if test -d .git; then \
-         $(MAKE) $(AM_MAKEFLAGS) clean-vcs-version; \
-         $(MAKE) $(AM_MAKEFLAGS) vcs-version; \
+         T=`mktemp` ; trap 'rm -f $$T' EXIT; \
+         git describe > $$T; \
+         if ! cmp --quiet $$T vcs-version; then \
+           mv $$T vcs-version; \
+         fi; \
        fi
 
 htools/Ganeti/Version.hs: htools/Ganeti/Version.hs.in \
@@ -1253,6 +1265,7 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
          echo "XEN_CMD = '$(XEN_CMD)'"; \
          echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
+         echo "ENABLE_REMOTE_COMMANDS = $(ENABLE_REMOTE_COMMANDS)"; \
        } > $@
 
 lib/_vcsversion.py: Makefile vcs-version | stamp-directories