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>