Revision 52fca4ba configure.ac
b/configure.ac | ||
---|---|---|
104 | 104 |
[Sets the xen cli interface command (default is xm)] |
105 | 105 |
)], |
106 | 106 |
[xen_cmd="$withval"], |
107 |
[xen_cmd="xm"])
|
|
107 |
[xen_cmd=xm])
|
|
108 | 108 |
AC_SUBST(XEN_CMD, $xen_cmd) |
109 | 109 |
|
110 | 110 |
if ! test "$XEN_CMD" = xl -o "$XEN_CMD" = xm; then |
... | ... | |
134 | 134 |
fi |
135 | 135 |
]], |
136 | 136 |
[[file_storage_dir="/srv/ganeti/file-storage"; |
137 |
enable_file_storage="True"]])
|
|
137 |
enable_file_storage=True]])
|
|
138 | 138 |
AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir) |
139 | 139 |
AC_SUBST(ENABLE_FILE_STORAGE, $enable_file_storage) |
140 | 140 |
|
... | ... | |
152 | 152 |
fi |
153 | 153 |
]], |
154 | 154 |
[[shared_file_storage_dir="/srv/ganeti/shared-file-storage"; |
155 |
enable_shared_file_storage="True"]])
|
|
155 |
enable_shared_file_storage=True]])
|
|
156 | 156 |
AC_SUBST(SHARED_FILE_STORAGE_DIR, $shared_file_storage_dir) |
157 | 157 |
AC_SUBST(ENABLE_SHARED_FILE_STORAGE, $enable_shared_file_storage) |
158 | 158 |
|
... | ... | |
173 | 173 |
[ (default is 1)] |
174 | 174 |
)], |
175 | 175 |
[lvm_stripecount="$withval"], |
176 |
[lvm_stripecount="1"])
|
|
176 |
[lvm_stripecount=1])
|
|
177 | 177 |
AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount) |
178 | 178 |
|
179 | 179 |
# --with-ssh-login-user=... |
... | ... | |
268 | 268 |
# --enable-drbd-barriers |
269 | 269 |
AC_ARG_ENABLE([drbd-barriers], |
270 | 270 |
[AS_HELP_STRING([--enable-drbd-barriers], |
271 |
[enable by default the DRBD barriers functionality (>= 8.0.12) (default: enabled)])], |
|
271 |
m4_normalize([enable the DRBD barriers functionality by |
|
272 |
default (>= 8.0.12) (default: enabled)]))], |
|
272 | 273 |
[[if test "$enableval" != no; then |
273 | 274 |
DRBD_BARRIERS=n |
274 | 275 |
DRBD_NO_META_FLUSH=False |
... | ... | |
444 | 445 |
fi |
445 | 446 |
|
446 | 447 |
AC_MSG_CHECKING([checking for extra GHC flags]) |
447 |
GHC_BYVERSION_FLAGS=""
|
|
448 |
GHC_BYVERSION_FLAGS= |
|
448 | 449 |
# check for GHC supported flags that vary accross versions |
449 | 450 |
for flag in -fwarn-incomplete-uni-patterns; do |
450 |
if $GHC -e "0" $flag >/dev/null 2>/dev/null; then
|
|
451 |
if $GHC -e '0' $flag >/dev/null 2>/dev/null; then
|
|
451 | 452 |
GHC_BYVERSION_FLAGS="$GHC_BYVERSION_FLAGS $flag" |
452 | 453 |
fi |
453 | 454 |
done |
... | ... | |
464 | 465 |
# check for modules, first custom/special checks |
465 | 466 |
AC_MSG_NOTICE([checking for required haskell modules]) |
466 | 467 |
HTOOLS_NOCURL=-DNO_CURL |
467 |
if test "$enable_htools_rapi" != "no"; then
|
|
468 |
if test "$enable_htools_rapi" != no; then
|
|
468 | 469 |
AC_GHC_PKG_CHECK([curl], [HTOOLS_NOCURL=], []) |
469 | 470 |
if test -n "$HTOOLS_NOCURL"; then |
470 |
if test "$enable_htools_rapi" = "check"; then
|
|
471 |
if test "$enable_htools_rapi" = check; then
|
|
471 | 472 |
AC_MSG_WARN(m4_normalize([The curl library was not found, Haskell |
472 | 473 |
code will be compiled without RAPI support])) |
473 | 474 |
else |
... | ... | |
495 | 496 |
# extra modules for confd functionality |
496 | 497 |
HTOOLS_REGEX_PCRE=-DNO_REGEX_PCRE |
497 | 498 |
has_confd=False |
498 |
if test "$enable_confd" != "no"; then
|
|
499 |
if test "$enable_confd" != no; then
|
|
499 | 500 |
CONFD_PKG= |
500 | 501 |
AC_GHC_PKG_CHECK([regex-pcre], [HTOOLS_REGEX_PCRE=], |
501 | 502 |
[CONFD_PKG="$CONFD_PKG regex-pcre"]) |
... | ... | |
505 | 506 |
AC_GHC_PKG_CHECK([hinotify], [], [CONFD_PKG="$CONFD_PKG hinotify"]) |
506 | 507 |
if test -z "$CONFD_PKG"; then |
507 | 508 |
has_confd=True |
509 |
elif test "$enable_confd" = check; then |
|
510 |
AC_MSG_WARN(m4_normalize([The required extra libraries for confd were |
|
511 |
not found ($CONFD_PKG), confd disabled])) |
|
508 | 512 |
else |
509 |
if test "$enable_confd" = "check"; then |
|
510 |
AC_MSG_WARN(m4_normalize([The required extra libraries for confd were |
|
511 |
not found ($CONFD_PKG), confd disabled])) |
|
512 |
else |
|
513 |
AC_MSG_FAILURE(m4_normalize([The confd functionality was requested, but |
|
514 |
required libraries were not found: |
|
515 |
$CONFD_PKG])) |
|
516 |
fi |
|
513 |
AC_MSG_FAILURE(m4_normalize([The confd functionality was requested, but |
|
514 |
required libraries were not found: |
|
515 |
$CONFD_PKG])) |
|
517 | 516 |
fi |
518 | 517 |
fi |
519 | 518 |
AC_SUBST(HTOOLS_REGEX_PCRE) |
520 |
if test "$has_confd" = "True"; then
|
|
519 |
if test "$has_confd" = True; then
|
|
521 | 520 |
AC_MSG_NOTICE([Enabling confd usage]) |
522 | 521 |
fi |
523 | 522 |
AC_SUBST(ENABLE_CONFD, $has_confd) |
... | ... | |
525 | 524 |
|
526 | 525 |
#extra modules for monitoring agent functionality |
527 | 526 |
has_monitoring=False |
528 |
if test "$enable_monitoring" != "no"; then
|
|
527 |
if test "$enable_monitoring" != no; then
|
|
529 | 528 |
MONITORING_PKG= |
530 |
AC_GHC_PKG_CHECK([attoparsec], [], [MONITORING_PKG="$MONITORING_PKG attoparsec"]) |
|
529 |
AC_GHC_PKG_CHECK([attoparsec], [], |
|
530 |
[MONITORING_PKG="$MONITORING_PKG attoparsec"]) |
|
531 | 531 |
if test -z "$MONITORING_PKG"; then |
532 | 532 |
has_monitoring=True |
533 |
elif test "$enable_monitoring" = check; then |
|
534 |
AC_MSG_WARN(m4_normalize([The required extra libraries for the monitoring |
|
535 |
agent were not found ($MONITORING_PKG), |
|
536 |
monitoring disabled])) |
|
533 | 537 |
else |
534 |
if test "$enable_monitoring" = "check"; then |
|
535 |
AC_MSG_WARN(m4_normalize([The required extra libraries for the monitoring |
|
536 |
agent were not found ($MONITORING_PKG), |
|
537 |
monitoring disabled])) |
|
538 |
else |
|
539 |
AC_MSG_FAILURE(m4_normalize([The monitoring functionality was requested, but |
|
540 |
required libraries were not found: |
|
541 |
$MONITORING_PKG])) |
|
542 |
fi |
|
538 |
AC_MSG_FAILURE(m4_normalize([The monitoring functionality was requested, but |
|
539 |
required libraries were not found: |
|
540 |
$MONITORING_PKG])) |
|
543 | 541 |
fi |
544 | 542 |
fi |
545 |
if test "$has_monitoring" = "True"; then
|
|
543 |
if test "$has_monitoring" = True; then
|
|
546 | 544 |
AC_MSG_NOTICE([Enabling the monitoring agent usage]) |
547 | 545 |
fi |
548 | 546 |
AC_SUBST(ENABLE_MONITORING, $has_monitoring) |
549 |
AM_CONDITIONAL([ENABLE_MONITORING], [test x$has_monitoring = xTrue])
|
|
547 |
AM_CONDITIONAL([ENABLE_MONITORING], [test "$has_monitoring" = True])
|
|
550 | 548 |
|
551 | 549 |
# development modules |
552 | 550 |
HTOOLS_NODEV= |
... | ... | |
625 | 623 |
AC_MSG_WARN(m4_normalize([haddock not found, htools API documentation will |
626 | 624 |
not be generated])) |
627 | 625 |
fi |
628 |
if test "$HADDOCK" && test "$HSCOLOUR"; then
|
|
626 |
if test -n "$HADDOCK" && test -n "$HSCOLOUR"; then
|
|
629 | 627 |
HTOOLS_APIDOC=yes |
630 | 628 |
fi |
631 | 629 |
AC_SUBST(HTOOLS_APIDOC) |
... | ... | |
638 | 636 |
AC_MSG_WARN([hlint not found, checking code will not be possible]) |
639 | 637 |
fi |
640 | 638 |
|
641 |
if test "$HTOOLS" != "yes" && test "$ENABLE_CONFD" = "True"; then
|
|
642 |
AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if
|
|
643 |
htools support is not enabled]))
|
|
639 |
if test "$HTOOLS" != yes && test "$ENABLE_CONFD" = True; then
|
|
640 |
AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if |
|
641 |
htools support is not enabled])) |
|
644 | 642 |
fi |
645 | 643 |
|
646 |
AM_CONDITIONAL([WANT_HTOOLS], [test x$HTOOLS = xyes])
|
|
644 |
AM_CONDITIONAL([WANT_HTOOLS], [test "$HTOOLS" = yes])
|
|
647 | 645 |
AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$HTOOLS_NODEV" = x]) |
648 |
AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes])
|
|
646 |
AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test "$HTOOLS_APIDOC" = yes])
|
|
649 | 647 |
AM_CONDITIONAL([HAS_HLINT], [test "$HLINT"]) |
650 | 648 |
|
651 | 649 |
# Check for fakeroot |
Also available in: Unified diff