From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NeMc9-0004wA-4q for qemu-devel@nongnu.org; Mon, 08 Feb 2010 00:56:53 -0500 Received: from [199.232.76.173] (port=49589 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NeMc8-0004w2-E1 for qemu-devel@nongnu.org; Mon, 08 Feb 2010 00:56:52 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NeMc3-00031u-At for qemu-devel@nongnu.org; Mon, 08 Feb 2010 00:56:52 -0500 Received: from mail-pz0-f176.google.com ([209.85.222.176]:52094) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NeMc3-00031U-2C for qemu-devel@nongnu.org; Mon, 08 Feb 2010 00:56:47 -0500 Received: by pzk6 with SMTP id 6so4672463pzk.18 for ; Sun, 07 Feb 2010 21:56:44 -0800 (PST) MIME-Version: 1.0 Date: Mon, 8 Feb 2010 13:56:44 +0800 Message-ID: From: TeLeMan Content-Type: text/plain; charset=UTF-8 Subject: [Qemu-devel] [PATCH] fix the static compilation for sdl List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel The static compilation for sdl is broken after 79427693174a553d62f3da44aacd3f19ba8df3a7. Signed-off-by: TeLeMan --- 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