Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20141015-1' into staging
commitad089894a8b203593e1d3f77b54fd5a43dc16c5b
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 22 Oct 2014 12:08:43 +0000 (22 13:08 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 22 Oct 2014 12:08:43 +0000 (22 13:08 +0100)
treecff3b7bef30c1caa2be42a81925e821a32a5a8b6
parent31cc9514a50d1dc9fc71aec4e309c8af6fd83f3e
parent50e12060696711eca1b09b82b9215ccdeaadfd09
Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20141015-1' into staging

configure: Prepend pixman and ftd flags to overrule system-provided ones

# gpg: Signature made Wed 15 Oct 2014 11:21:13 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-console-20141015-1:
  configure: Prepend pixman and ftd flags to overrule system-provided ones

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>