Merge commit 'ca35f780ac4654bfa086613c72b011448afff327' into upstream-merge
commit9f4c45171168b5f50d6b4f127ee2fc83c5b012f4
authorAvi Kivity <avi@redhat.com>
Mon, 21 Jun 2010 13:46:55 +0000 (21 16:46 +0300)
committerAvi Kivity <avi@redhat.com>
Mon, 21 Jun 2010 13:46:55 +0000 (21 16:46 +0300)
tree5fd54ca43955944c899971d31323f1620004115c
parent195a4474229c6f3bcc7cd291d600dc624548a493
parentca35f780ac4654bfa086613c72b011448afff327
Merge commit 'ca35f780ac4654bfa086613c72b011448afff327' into upstream-merge

* commit 'ca35f780ac4654bfa086613c72b011448afff327':
  move computation of tools and roms outside of config-host.mak generation
  configure: move directory defaults earlier
  configure: ignore unknown --xyzdir options
  configure: introduce more --xyzdir options
  configure: expand ${prefix} in create_config
  configure: move all directory entries in config-host.mak close
  configure: unify handling of xyzdir variables
  rename CONFIG_QEMU_PREFIX
  configure: introduce confdir and confsuffix

Conflicts:
configure

Signed-off-by: Avi Kivity <avi@redhat.com>
configure
vl.c