Revision 5d453688

b/configure.ac
582 582 
  MONITORING_PKG=
583 583 
  AC_GHC_PKG_CHECK([attoparsec], [],
584 584 
                   [MONITORING_PKG="$MONITORING_PKG attoparsec"])
585 
  MONITORING_DEP=
586 
  if test "$has_confd" = False; then
587 
    MONITORING_DEP="$MONITORING_DEP confd"
588 
  fi
589 
  has_monitoring_pkg=False
585 590 
  if test -z "$MONITORING_PKG"; then
586 
    has_monitoring=True
591 
    has_monitoring_pkg=True
587 592 
  elif test "$enable_monitoring" = check; then
588 593 
    AC_MSG_WARN(m4_normalize([The required extra libraries for the monitoring
589 594 
                              agent were not found ($MONITORING_PKG),
......
593 598 
                                 required libraries were not found:
594 599 
                                 $MONITORING_PKG]))
595 600 
  fi
601 
  has_monitoring_dep=False
602 
  if test -z "$MONITORING_DEP"; then
603 
    has_monitoring_dep=True
604 
  elif test "$enable_monitoring" = check; then
605 
    AC_MSG_WARN(m4_normalize([The optional Ganeti components required for the
606 
                              monitoring agent were not enabled
607 
                              ($MONITORING_DEP), monitoring disabled]))
608 
  else
609 
    AC_MSG_FAILURE(m4_normalize([The monitoring functionality was requested, but
610 
                                 required optional Ganeti components were not
611 
                                 found: $MONITORING_DEP]))
612 
  fi
613 

  		





  596
  614
  
    
fi


  		





  597
  
  
    
if test "$has_monitoring" = True; then


  		





  
  615
  
    
if test "$has_monitoring_pkg" = True -a "$has_monitoring_dep" = True; then


  		





  
  616
  
    
  has_monitoring=True


  		





  598
  617
  
    
  AC_MSG_NOTICE([Enabling the monitoring agent usage])


  		





  599
  618
  
    
fi


  		





  600
  619
  
    
AC_SUBST(ENABLE_MONITORING, $has_monitoring)


  		












Also available in:
  Unified diff