From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NeRoy-0007jG-LQ
	for qemu-devel@nongnu.org; Mon, 08 Feb 2010 06:30:29 -0500
Received: from [199.232.76.173] (port=53151 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NeRox-0007il-MC
	for qemu-devel@nongnu.org; Mon, 08 Feb 2010 06:30:27 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <aurelien@aurel32.net>) id 1NeRor-0004wp-SH
	for qemu-devel@nongnu.org; Mon, 08 Feb 2010 06:30:27 -0500
Received: from hall.aurel32.net ([88.191.82.174]:55616)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <aurelien@aurel32.net>)
	id 1NeRoq-0004vD-LC
	for qemu-devel@nongnu.org; Mon, 08 Feb 2010 06:30:20 -0500
Date: Mon, 8 Feb 2010 12:30:14 +0100
From: Aurelien Jarno <aurelien@aurel32.net>
Subject: Re: [Qemu-devel] [PATCH] fix the static compilation for sdl
Message-ID: <20100208113014.GA2462@volta.aurel32.net>
References: <a38b25541002072156v1bed25e8k151d757ea071abd6@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
In-Reply-To: <a38b25541002072156v1bed25e8k151d757ea071abd6@mail.gmail.com>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: TeLeMan <geleman@gmail.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

On Mon, Feb 08, 2010 at 01:56:44PM +0800, TeLeMan wrote:
> The static compilation for sdl is broken after
> 79427693174a553d62f3da44aacd3f19ba8df3a7.
> 
> Signed-off-by: TeLeMan <geleman@gmail.com>

Thanks, applied.

> ---
>  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
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net