Revision f4445f53
| b/Makefile.am | ||
|---|---|---|
| 280 | 280 |
$(PYTHON_BOOTSTRAP) \ |
| 281 | 281 |
$(gnt_python_sbin_SCRIPTS) |
| 282 | 282 |
|
| 283 |
HS_GENERATED_FILES = |
|
| 284 |
if WANT_HTOOLS |
|
| 285 |
HS_GENERATED_FILES += $(HS_PROGS) |
|
| 283 |
HS_GENERATED_FILES = $(HS_PROGS) src/hluxid src/ganeti-luxid |
|
| 286 | 284 |
if ENABLE_CONFD |
| 287 |
HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hluxid src/ganeti-luxid
|
|
| 285 |
HS_GENERATED_FILES += src/hconfd src/ganeti-confd |
|
| 288 | 286 |
endif |
| 289 |
|
|
| 290 | 287 |
if ENABLE_MOND |
| 291 | 288 |
HS_GENERATED_FILES += src/ganeti-mond |
| 292 | 289 |
endif |
| 293 |
endif |
|
| 294 | 290 |
|
| 295 | 291 |
built_base_sources = \ |
| 296 | 292 |
stamp-directories \ |
| ... | ... | |
| 983 | 979 |
qa/qa_utils.py \ |
| 984 | 980 |
qa/rapi-workload.py |
| 985 | 981 |
|
| 986 |
bin_SCRIPTS = |
|
| 987 |
if WANT_HTOOLS |
|
| 988 |
bin_SCRIPTS += $(HS_BIN_PROGS) |
|
| 982 |
bin_SCRIPTS = $(HS_BIN_PROGS) |
|
| 989 | 983 |
install-exec-hook: |
| 990 | 984 |
@mkdir_p@ $(DESTDIR)$(iallocatorsdir) |
| 991 | 985 |
# FIXME: this is a hardcoded logic, instead of auto-resolving |
| ... | ... | |
| 994 | 988 |
for role in $(HS_BIN_ROLES); do \ |
| 995 | 989 |
$(LN_S) -f htools $(DESTDIR)$(bindir)/$$role ; \ |
| 996 | 990 |
done |
| 997 |
endif |
|
| 998 | 991 |
|
| 999 | 992 |
HNORMAL_SUFFIX = .o |
| 1000 | 993 |
HPROFILE_SUFFIX = .prof.o |
| ... | ... | |
| 2360 | 2353 |
.PHONY: coverage |
| 2361 | 2354 |
|
| 2362 | 2355 |
COVERAGE_TESTS= |
| 2363 |
if WANT_HTOOLS |
|
| 2364 | 2356 |
COVERAGE_TESTS += hs-coverage |
| 2365 |
endif |
|
| 2366 | 2357 |
if PY_UNIT |
| 2367 | 2358 |
COVERAGE_TESTS += py-coverage |
| 2368 | 2359 |
endif |
| b/configure.ac | ||
|---|---|---|
| 633 | 633 |
fi |
| 634 | 634 |
AC_SUBST(HS_NODEV) |
| 635 | 635 |
|
| 636 |
HTOOLS=yes |
|
| 637 |
AC_SUBST(HTOOLS) |
|
| 638 |
|
|
| 639 | 636 |
# Check for HsColour |
| 640 | 637 |
HS_APIDOC=no |
| 641 | 638 |
AC_ARG_VAR(HSCOLOUR, [HsColour path]) |
| ... | ... | |
| 664 | 661 |
AC_MSG_WARN([hlint not found, checking code will not be possible]) |
| 665 | 662 |
fi |
| 666 | 663 |
|
| 667 |
if test "$HTOOLS" != yes && test "$ENABLE_CONFD" = True; then |
|
| 668 |
AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if |
|
| 669 |
htools support is not enabled])) |
|
| 670 |
fi |
|
| 671 |
|
|
| 672 |
AM_CONDITIONAL([WANT_HTOOLS], [test "$HTOOLS" = yes]) |
|
| 673 | 664 |
AM_CONDITIONAL([WANT_HSTESTS], [test "x$HS_NODEV" = x]) |
| 674 | 665 |
AM_CONDITIONAL([WANT_HSAPIDOC], [test "$HS_APIDOC" = yes]) |
| 675 | 666 |
AM_CONDITIONAL([HAS_HLINT], [test "$HLINT"]) |
Also available in: Unified diff