From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 2/4] sdl: prefer sdl2 over sdl1
Date: Tue, 6 Jun 2017 12:53:37 +0200 [thread overview]
Message-ID: <20170606105339.3613-3-kraxel@redhat.com> (raw)
In-Reply-To: <20170606105339.3613-1-kraxel@redhat.com>
In case the configure script finds both SDL 1.2 and SDL 2.x installed
it still prefers SDL 1.2. Prefer SDL 2.x instead.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
configure | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index b75b9c57c0..44c773a5cd 100755
--- a/configure
+++ b/configure
@@ -2622,12 +2622,12 @@ fi
# sdl-config even without cross prefix, and favour pkg-config over sdl-config.
if test "$sdlabi" = ""; then
- if $pkg_config --exists "sdl"; then
- sdlabi=1.2
- elif $pkg_config --exists "sdl2"; then
+ if $pkg_config --exists "sdl2"; then
sdlabi=2.0
+ elif $pkg_config --exists "sdl"; then
+ sdlabi=1.2
else
- sdlabi=1.2
+ sdlabi=2.0
fi
fi
@@ -2654,7 +2654,7 @@ elif has ${sdl_config}; then
sdlversion=$($sdlconfig --version)
else
if test "$sdl" = "yes" ; then
- feature_not_found "sdl" "Install SDL devel"
+ feature_not_found "sdl" "Install SDL2-devel"
fi
sdl=no
fi
--
2.9.3
next prev parent reply other threads:[~2017-06-06 10:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 10:53 [Qemu-devel] [PATCH 0/4] gtk/sdl: use newer versions by default, deprecate the old ones Gerd Hoffmann
2017-06-06 10:53 ` [Qemu-devel] [PATCH 1/4] gtk: prefer gtk3 over gtk2 Gerd Hoffmann
2017-06-06 10:53 ` Gerd Hoffmann [this message]
2017-06-06 10:53 ` [Qemu-devel] [PATCH 3/4] gtk: add deprecation warning for gtk2 Gerd Hoffmann
2017-06-06 10:53 ` [Qemu-devel] [PATCH 4/4] sdl: add deprecation warning for sdl1 Gerd Hoffmann
2017-06-06 11:00 ` [Qemu-devel] [PATCH 0/4] gtk/sdl: use newer versions by default, deprecate the old ones Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170606105339.3613-3-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).