Revision 13cc7b84 configure.ac

b/configure.ac
484 484
ENABLE_MOND=
485 485
AC_ARG_ENABLE([monitoring],
486 486
  [AS_HELP_STRING([--enable-monitoring],
487
  [enable the ganeti monitoring agent (default: check)])],
487
  [enable the ganeti monitoring daemon (default: check)])],
488 488
  [],
489 489
  [enable_monitoring=check])
490 490

  
......
558 558
AC_SUBST(ENABLE_CONFD, $has_confd)
559 559
AM_CONDITIONAL([ENABLE_CONFD], [test x$has_confd = xTrue])
560 560

  
561
#extra modules for monitoring agent functionality
561
#extra modules for monitoring daemon functionality
562 562
has_monitoring=False
563 563
if test "$enable_monitoring" != no; then
564 564
  MONITORING_PKG=
565 565
  AC_GHC_PKG_CHECK([attoparsec], [],
566 566
                   [MONITORING_PKG="$MONITORING_PKG attoparsec"])
567
  AC_GHC_PKG_CHECK([snap-server], [],
568
                   [MONITORING_PKG="$MONITORING_PKG snap-server"])
567 569
  if test -z "$MONITORING_PKG"; then
568 570
    has_monitoring=True
569 571
  elif test "$enable_monitoring" = check; then
570 572
    AC_MSG_WARN(m4_normalize([The required extra libraries for the monitoring
571
                              agent were not found ($MONITORING_PKG),
573
                              daemon were not found ($MONITORING_PKG),
572 574
                              monitoring disabled]))
573 575
  else
574 576
    AC_MSG_FAILURE(m4_normalize([The monitoring functionality was requested, but
......
577 579
  fi
578 580
fi
579 581
if test "$has_monitoring" = True; then
580
  AC_MSG_NOTICE([Enabling the monitoring agent usage])
582
  AC_MSG_NOTICE([Enabling the monitoring daemon usage])
581 583
fi
582 584
AC_SUBST(ENABLE_MOND, $has_monitoring)
583 585
AM_CONDITIONAL([ENABLE_MOND], [test "$has_monitoring" = True])

Also available in: Unified diff