From 67c274d3c72ae0e906ff20694e272b47b1d8d827 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 13 Jan 2010 09:52:54 +0100 Subject: [PATCH] fixes to the static compilation case for sdl After the next commit, pkg-config could be used for the shared library configuration case and sdl-config for static libraries. So I prepare the test here by doing two changes: at the same time I remove useless backslashes from the invocation of grep; 1) fixing a typo ($sd_cflags). The typo has been there since commit 1ac88f2 (remove sdl_static. Just do the right thing if static is yes, 2009-07-27). 2) fixing an erroneous "test `... | grep > /dev/null`" idiom that would never succeed since grep's output would be empty; 3) checking the status code after executing sdl-config --static --libs; this is needed for the next patch only. Signed-off-by: Paolo Bonzini Signed-off-by: Anthony Liguori --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a287efaec9..eab0cb4945 100755 --- a/configure +++ b/configure @@ -1010,12 +1010,12 @@ EOF fi fi - # static link with sdl ? + # 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 `sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` ; then + if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`" - sdl_cflags="$sd_cflags `aalib-config --cflags >2 /dev/null`" + sdl_cflags="$sdl_cflags `aalib-config --cflags >2 /dev/null`" fi if compile_prog "$sdl_cflags" "$sdl_libs" ; then :