Revision 0cd5ab45

b/Makefile.am
1854 1854
	    -DMOND_GROUP="$(MOND_GROUP)" \
1855 1855
	    -DDISK_SEPARATOR="$(DISK_SEPARATOR)" \
1856 1856
	    -DQEMUIMG_PATH="$(QEMUIMG_PATH)" \
1857
	    -DHTOOLS="True" \
1858 1857
	    -DENABLE_CONFD="$(ENABLE_CONFD)" \
1859 1858
	    -DXEN_CMD="$(XEN_CMD)" \
1860 1859
	    -DENABLE_RESTRICTED_COMMANDS="$(ENABLE_RESTRICTED_COMMANDS)" \
b/autotools/build-bash-completion
848 848
  WriteHaskellCompletion(sw, "daemons/ganeti-cleaner", htools=False,
849 849
                         debug=not options.compact)
850 850

  
851
  # htools, if enabled
852
  if _constants.HTOOLS:
853
    for script in _constants.HTOOLS_PROGS:
854
      WriteHaskellCompletion(sw, script, htools=True, debug=debug)
851
  # htools
852
  for script in _constants.HTOOLS_PROGS:
853
    WriteHaskellCompletion(sw, script, htools=True, debug=debug)
855 854

  
856 855
  # ganeti-confd, if enabled
857 856
  if _constants.ENABLE_CONFD:
b/lib/bootstrap.py
735 735
      raise errors.OpPrereqError("Invalid default iallocator script '%s'"
736 736
                                 " specified" % default_iallocator,
737 737
                                 errors.ECODE_INVAL)
738
  elif constants.HTOOLS:
739
    # htools was enabled at build-time, we default to it
738
  else:
739
    # default to htools
740 740
    if utils.FindFile(constants.IALLOC_HAIL,
741 741
                      constants.IALLOCATOR_SEARCH_PATH,
742 742
                      os.path.isfile):
b/src/Ganeti/Constants.hs
4161 4161
qemuimgPath :: String
4162 4162
qemuimgPath = AutoConf.qemuimgPath
4163 4163

  
4164
-- | Whether htools was enabled at compilation time
4165
--
4166
-- FIXME: this should be moved next to the other enable constants,
4167
-- such as, 'enableConfd', and renamed to 'enableHtools'.
4168
htools :: Bool
4169
htools = AutoConf.htools
4170

  
4171 4164
-- | The hail iallocator
4172 4165
iallocHail :: String
4173 4166
iallocHail = "hail"

Also available in: Unified diff