From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NeP0d-0004mx-C8
	for qemu-devel@nongnu.org; Mon, 08 Feb 2010 03:30:19 -0500
Received: from [199.232.76.173] (port=36279 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NeP0Y-0004mM-JD
	for qemu-devel@nongnu.org; Mon, 08 Feb 2010 03:30:15 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <pbonzini@redhat.com>) id 1NeP0U-0000Ez-0W
	for qemu-devel@nongnu.org; Mon, 08 Feb 2010 03:30:14 -0500
Received: from mx1.redhat.com ([209.132.183.28]:1652)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <pbonzini@redhat.com>) id 1NeP0T-0000El-KQ
	for qemu-devel@nongnu.org; Mon, 08 Feb 2010 03:30:09 -0500
Message-ID: <4B6FCB89.8040000@redhat.com>
Date: Mon, 08 Feb 2010 09:30:01 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <a38b25541002072156v1bed25e8k151d757ea071abd6@mail.gmail.com>
In-Reply-To: <a38b25541002072156v1bed25e8k151d757ea071abd6@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH] fix the static compilation for sdl
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 02/08/2010 06:56 AM, TeLeMan wrote:
> The static compilation for sdl is broken after
> 79427693174a553d62f3da44aacd3f19ba8df3a7.

ACK.

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