Revision 30841576
| b/configure.ac | ||
|---|---|---|
| 111 | 111 |
enable_file_storage=False |
| 112 | 112 |
fi |
| 113 | 113 |
]], |
| 114 |
[[file_storage_dir="/srv/ganeti/file-storage"; enable_file_storage="True"]]) |
|
| 114 |
[[file_storage_dir="/srv/ganeti/file-storage"; |
|
| 115 |
enable_file_storage="True"]]) |
|
| 115 | 116 |
AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir) |
| 116 | 117 |
AC_SUBST(ENABLE_FILE_STORAGE, $enable_file_storage) |
| 117 | 118 |
|
| ... | ... | |
| 128 | 129 |
enable_shared_file_storage=False |
| 129 | 130 |
fi |
| 130 | 131 |
]], |
| 131 |
[[shared_file_storage_dir="/srv/ganeti/shared-file-storage"; enable_shared_file_storage="True"]]) |
|
| 132 |
[[shared_file_storage_dir="/srv/ganeti/shared-file-storage"; |
|
| 133 |
enable_shared_file_storage="True"]]) |
|
| 132 | 134 |
AC_SUBST(SHARED_FILE_STORAGE_DIR, $shared_file_storage_dir) |
| 133 | 135 |
AC_SUBST(ENABLE_SHARED_FILE_STORAGE, $enable_shared_file_storage) |
| 134 | 136 |
|
| ... | ... | |
| 259 | 261 |
# --with-disk-separator=... |
| 260 | 262 |
AC_ARG_WITH([disk-separator], |
| 261 | 263 |
[AS_HELP_STRING([--with-disk-separator=STRING], |
| 262 |
[Disk index separator, useful if the default of ':' is handled specially by the hypervisor] |
|
| 264 |
[Disk index separator, useful if the default of ':' is handled] |
|
| 265 |
[ specially by the hypervisor] |
|
| 263 | 266 |
)], |
| 264 | 267 |
[disk_separator="$withval"], |
| 265 | 268 |
[disk_separator=":"]) |
| ... | ... | |
| 282 | 285 |
AC_PATH_PROG(SPHINX, [sphinx-build], []) |
| 283 | 286 |
if test -z "$SPHINX" |
| 284 | 287 |
then |
| 285 |
AC_MSG_WARN([sphinx-build not found, documentation rebuild will not be possible]) |
|
| 288 |
AC_MSG_WARN(m4_normalize([sphinx-build not found, documentation rebuild will |
|
| 289 |
not be possible])) |
|
| 286 | 290 |
fi |
| 287 | 291 |
|
| 288 | 292 |
# Check for graphviz (dot) |
| ... | ... | |
| 290 | 294 |
AC_PATH_PROG(DOT, [dot], []) |
| 291 | 295 |
if test -z "$DOT" |
| 292 | 296 |
then |
| 293 |
AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible]) |
|
| 297 |
AC_MSG_WARN(m4_normalize([dot (from the graphviz suite) not found, |
|
| 298 |
documentation rebuild not possible])) |
|
| 294 | 299 |
fi |
| 295 | 300 |
|
| 296 | 301 |
# Check for pylint |
| ... | ... | |
| 337 | 342 |
GHC_PKG_CURL=$($GHC_PKG latest curl) |
| 338 | 343 |
if test -z "$GHC_PKG_CURL"; then |
| 339 | 344 |
if test "$enable_htools_rapi" = "check"; then |
| 340 |
AC_MSG_WARN([The curl library not found, htools will be compiled
|
|
| 341 |
without RAPI support])
|
|
| 345 |
AC_MSG_WARN(m4_normalize([The curl library not found, htools will be
|
|
| 346 |
compiled without RAPI support]))
|
|
| 342 | 347 |
else |
| 343 |
AC_MSG_FAILURE([The curl library was not found, but it has |
|
| 344 |
been requested])
|
|
| 348 |
AC_MSG_FAILURE(m4_normalize([The curl library was not found, but it has
|
|
| 349 |
been requested]))
|
|
| 345 | 350 |
fi |
| 346 | 351 |
else |
| 347 | 352 |
HTOOLS_NOCURL= |
| ... | ... | |
| 367 | 372 |
if test -z "$GHC_PKG_PARALLEL" || test -z "$GHC_PKG_JSON" || \ |
| 368 | 373 |
test -z "$GHC_PKG_NETWORK"; then |
| 369 | 374 |
if test "$enable_htools" != "check"; then |
| 370 |
AC_MSG_FAILURE([Required Haskell modules not found, htools compilation |
|
| 371 |
disabled]) |
|
| 372 |
|
|
| 375 |
AC_MSG_FAILURE(m4_normalize([Required Haskell modules not found, htools |
|
| 376 |
compilation disabled])) |
|
| 373 | 377 |
fi |
| 374 | 378 |
else |
| 375 | 379 |
# we leave the other modules to be auto-selected |
| ... | ... | |
| 380 | 384 |
|
| 381 | 385 |
if test "$enable_htools" != "no"; then |
| 382 | 386 |
if test -z "$GHC" || test -z "$HTOOLS_MODULES"; then |
| 383 |
AC_MSG_WARN([Haskell compiler/required libraries not found, htools
|
|
| 384 |
compilation disabled])
|
|
| 387 |
AC_MSG_WARN(m4_normalize([Haskell compiler/required libraries not found,
|
|
| 388 |
htools compilation disabled]))
|
|
| 385 | 389 |
else |
| 386 | 390 |
HTOOLS=yes |
| 387 | 391 |
fi |
| ... | ... | |
| 393 | 397 |
AC_ARG_VAR(HSCOLOUR, [HsColour path]) |
| 394 | 398 |
AC_PATH_PROG(HSCOLOUR, [HsColour], []) |
| 395 | 399 |
if test -z "$HSCOLOUR"; then |
| 396 |
AC_MSG_WARN([HsColour not found, htools API documentation will not be
|
|
| 397 |
generated])
|
|
| 400 |
AC_MSG_WARN(m4_normalize([HsColour not found, htools API documentation will
|
|
| 401 |
not be generated]))
|
|
| 398 | 402 |
fi |
| 399 | 403 |
|
| 400 | 404 |
# Check for haddock |
| 401 | 405 |
AC_ARG_VAR(HADDOCK, [haddock path]) |
| 402 | 406 |
AC_PATH_PROG(HADDOCK, [haddock], []) |
| 403 | 407 |
if test -z "$HADDOCK"; then |
| 404 |
AC_MSG_WARN([haddock not found, htools API documentation will not be
|
|
| 405 |
generated])
|
|
| 408 |
AC_MSG_WARN(m4_normalize([haddock not found, htools API documentation will
|
|
| 409 |
not be generated]))
|
|
| 406 | 410 |
fi |
| 407 | 411 |
if test "$HADDOCK" && test "$HSCOLOUR"; then |
| 408 | 412 |
HTOOLS_APIDOC=yes |
| ... | ... | |
| 414 | 418 |
AM_CONDITIONAL([WANT_HTOOLS], [test x$HTOOLS = xyes]) |
| 415 | 419 |
AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes]) |
| 416 | 420 |
|
| 417 |
|
|
| 418 | 421 |
SOCAT_USE_ESCAPE= |
| 419 | 422 |
AC_ARG_ENABLE([socat-escape], |
| 420 | 423 |
[AS_HELP_STRING([--enable-socat-escape], |
| ... | ... | |
| 466 | 469 |
MAN_HAS_WARNINGS=1 |
| 467 | 470 |
else |
| 468 | 471 |
MAN_HAS_WARNINGS= |
| 469 |
AC_MSG_WARN([man doesn't support --warnings, man pages checks
|
|
| 470 |
will not be possible])
|
|
| 472 |
AC_MSG_WARN(m4_normalize([man does not support --warnings, man page checks
|
|
| 473 |
will not be possible]))
|
|
| 471 | 474 |
fi |
| 472 | 475 |
|
| 473 | 476 |
AC_SUBST(MAN_HAS_WARNINGS) |
| ... | ... | |
| 484 | 487 |
# This is optional but then we've limited functionality |
| 485 | 488 |
AC_PYTHON_MODULE(paramiko) |
| 486 | 489 |
if test "$HAVE_PYMOD_PARAMIKO" = "no"; then |
| 487 |
AC_MSG_WARN([You do not have paramiko installed. While this is optional you |
|
| 488 |
have to setup SSH and noded on the joining nodes yourself.]) |
|
| 490 |
AC_MSG_WARN(m4_normalize([You do not have Paramiko installed. While this is |
|
| 491 |
optional you have to configure SSH and the node |
|
| 492 |
daemon on the joining nodes yourself.])) |
|
| 489 | 493 |
fi |
| 490 | 494 |
|
| 491 | 495 |
AC_CONFIG_FILES([ Makefile ]) |
Also available in: Unified diff