Revision 73b0fa69 configure.ac

b/configure.ac
270 270 
ENABLE_CONFD=
271 271 
AC_ARG_ENABLE([confd],
272 272 
  [AS_HELP_STRING([--enable-confd],
273 
  [enable the ganeti-confd daemon (default: yes)])],
273 
  [enable the ganeti-confd daemon (default: python, options haskell/python/no)])],
274 274 
  [[case "$enableval" in
275 275 
      no)
276 276 
        enable_confd=False
277 
        py_confd=False
278 
        hs_confd=False
277 279 
        ;;
278 
      yes)
280 
      yes|python)
281 
        enable_confd=True
282 
        py_confd=True
283 
        hs_confd=False
284 
        ;;
285 
      haskell)
279 286 
        enable_confd=True
287 
        py_confd=False
288 
        hs_confd=True
280 289 
        ;;
281 290 
      *)
282 291 
        echo "Invalid value for enable-confd '$enableval'"
......
284 293 
        ;;
285 294 
    esac
286 295 
  ]],
287 
  [enable_confd=True])
296 
  [enable_confd=True;py_confd=True;hs_confd=False])
288 297 
AC_SUBST(ENABLE_CONFD, $enable_confd)
298 
AC_SUBST(PY_CONFD, $py_confd)
299 
AC_SUBST(HS_CONFD, $hs_confd)
289 300 

  		





  290
  301
  
    
AM_CONDITIONAL([WANT_CONFD], [test x$enable_confd = xTrue])


  		





  
  302
  
    
AM_CONDITIONAL([PY_CONFD], [test x$py_confd = xTrue])


  		





  
  303
  
    
AM_CONDITIONAL([HS_CONFD], [test x$hs_confd = xTrue])


  		





  291
  304
  
    

  		





  292
  305
  
    
# --with-disk-separator=...


  		





  293
  306
  
    
AC_ARG_WITH([disk-separator],


  		





  ......




  485
  498
  
    

  		





  486
  499
  
    
fi # end if enable_htools, define automake conditions


  		





  487
  500
  
    

  		





  
  501
  
    
if test "$HTOOLS" != "yes" && test "$HS_CONFD" = "True"; then


  		





  
  502
  
    
   AC_MSG_ERROR(m4_normalize([cannot enable Haskell version of ganeti-confd if


  		





  
  503
  
    
                              htools support is not enabled]))


  		





  
  504
  
    
fi


  		





  
  505
  
    

  		





  488
  506
  
    
AM_CONDITIONAL([WANT_HTOOLS], [test x$HTOOLS = xyes])


  		





  489
  507
  
    
AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$GHC_PKG_QUICKCHECK" != x])


  		





  490
  508
  
    
AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes])


  		












Also available in:
  Unified diff