qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: TeLeMan <geleman@gmail.com>
To: qemu-devel <qemu-devel@nongnu.org>
Subject: [Qemu-devel] [PATCH] fix the static compilation for sdl
Date: Mon, 8 Feb 2010 13:56:44 +0800	[thread overview]
Message-ID: <a38b25541002072156v1bed25e8k151d757ea071abd6@mail.gmail.com> (raw)

The static compilation for sdl is broken after
79427693174a553d62f3da44aacd3f19ba8df3a7.

Signed-off-by: TeLeMan <geleman@gmail.com>
---
 configure |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 4c95c27..213dddf 100644
--- a/configure
+++ b/configure
@@ -1063,7 +1063,11 @@ if test "$sdl" != "no" ; then
 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
 EOF
   sdl_cflags=`$sdlconfig --cflags 2> /dev/null`
-  sdl_libs=`$sdlconfig --libs 2> /dev/null`
+  if test "$static" = "yes" ; then
+    sdl_libs=`sdl-config --static-libs 2>/dev/null`
+  else
+    sdl_libs=`$sdlconfig --libs 2> /dev/null`
+  fi
   if compile_prog "$sdl_cflags" "$sdl_libs" ; then
     if test "$_sdlversion" -lt 121 ; then
       sdl_too_old=yes
@@ -1075,7 +1079,6 @@ EOF

     # static link with sdl ? (note: sdl.pc's --static --libs is broken)
     if test "$sdl" = "yes" -a "$static" = "yes" ; then
-      sdl_libs=`sdl-config --static-libs 2>/dev/null`
       if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then
          sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"
          sdl_cflags="$sdl_cflags `aalib-config --cflags >2 /dev/null`"
-- 
1.6.5.1.1367.gcd48

--
SUN OF A BEACH

             reply	other threads:[~2010-02-08  5:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-08  5:56 TeLeMan [this message]
2010-02-08  8:30 ` [Qemu-devel] Re: [PATCH] fix the static compilation for sdl Paolo Bonzini
2010-02-08  8:51 ` [Qemu-devel] " Loïc Minier
2010-02-08 11:30 ` Aurelien Jarno

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=a38b25541002072156v1bed25e8k151d757ea071abd6@mail.gmail.com \
    --to=geleman@gmail.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).