Revision 04520998 configure.ac
b/configure.ac | ||
---|---|---|
330 | 330 |
ENABLE_CONFD= |
331 | 331 |
AC_ARG_ENABLE([confd], |
332 | 332 |
[AS_HELP_STRING([--enable-confd], |
333 |
[enable the ganeti-confd daemon (default: python, options haskell/python/no)])],
|
|
333 |
[enable the ganeti-confd daemon (default: yes)])],
|
|
334 | 334 |
[[case "$enableval" in |
335 | 335 |
no) |
336 | 336 |
enable_confd=False |
337 |
py_confd=False |
|
338 |
hs_confd=False |
|
339 | 337 |
;; |
340 |
yes|python)
|
|
338 |
yes|haskell)
|
|
341 | 339 |
enable_confd=True |
342 |
py_confd=True |
|
343 |
hs_confd=False |
|
344 |
;; |
|
345 |
haskell) |
|
346 |
enable_confd=True |
|
347 |
py_confd=False |
|
348 |
hs_confd=True |
|
349 | 340 |
;; |
350 | 341 |
*) |
351 | 342 |
echo "Invalid value for enable-confd '$enableval'" |
... | ... | |
353 | 344 |
;; |
354 | 345 |
esac |
355 | 346 |
]], |
356 |
[enable_confd=True;py_confd=True;hs_confd=False])
|
|
347 |
[enable_confd=True]) |
|
357 | 348 |
AC_SUBST(ENABLE_CONFD, $enable_confd) |
358 |
AC_SUBST(PY_CONFD, $py_confd) |
|
359 |
AC_SUBST(HS_CONFD, $hs_confd) |
|
360 | 349 |
|
361 |
AM_CONDITIONAL([WANT_CONFD], [test x$enable_confd = xTrue]) |
|
362 |
AM_CONDITIONAL([PY_CONFD], [test x$py_confd = xTrue]) |
|
363 |
AM_CONDITIONAL([HS_CONFD], [test x$hs_confd = xTrue]) |
|
350 |
AM_CONDITIONAL([ENABLE_CONFD], [test x$enable_confd = xTrue]) |
|
364 | 351 |
|
365 | 352 |
# --enable-split-query |
366 | 353 |
ENABLE_SPLIT_QUERY= |
367 | 354 |
AC_ARG_ENABLE([split-query], |
368 | 355 |
[AS_HELP_STRING([--enable-split-query], |
369 |
[enable use of custom query daemon via Haskell confd])],
|
|
356 |
[enable use of custom query daemon via confd])], |
|
370 | 357 |
[[case "$enableval" in |
371 | 358 |
no) |
372 | 359 |
enable_split_query=False |
... | ... | |
383 | 370 |
[enable_split_query=False]) |
384 | 371 |
AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query) |
385 | 372 |
|
386 |
if test x$enable_split_query = xTrue -a x$hs_confd != xTrue; then
|
|
387 |
AC_MSG_ERROR([Split queries require the Haskell confd])
|
|
373 |
if test x$enable_split_query = xTrue -a x$enable_confd != xTrue; then
|
|
374 |
AC_MSG_ERROR([Split queries require the confd daemon])
|
|
388 | 375 |
fi |
389 | 376 |
|
390 | 377 |
# --with-disk-separator=... |
... | ... | |
592 | 579 |
|
593 | 580 |
fi # end if enable_htools, define automake conditions |
594 | 581 |
|
595 |
if test "$HTOOLS" != "yes" && test "$HS_CONFD" = "True"; then
|
|
596 |
AC_MSG_ERROR(m4_normalize([cannot enable Haskell version of ganeti-confd if
|
|
582 |
if test "$HTOOLS" != "yes" && test "$ENABLE_CONFD" = "True"; then
|
|
583 |
AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if |
|
597 | 584 |
htools support is not enabled])) |
598 | 585 |
fi |
599 | 586 |
|
Also available in: Unified diff