diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2010-01-13 09:52:55 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-13 17:14:14 -0600 |
commit | 9316f80399cab827e6a3e8c651c1be7fa8ba6008 (patch) | |
tree | 7af3d16a59bf02c4f861a7be64afe903aa42c1ed | |
parent | 67c274d3c72ae0e906ff20694e272b47b1d8d827 (diff) | |
download | qemu-9316f80399cab827e6a3e8c651c1be7fa8ba6008.zip qemu-9316f80399cab827e6a3e8c651c1be7fa8ba6008.tar.gz qemu-9316f80399cab827e6a3e8c651c1be7fa8ba6008.tar.bz2 |
use pkg-config for sdl whenever available
Together with the first patch this enables using the prefixed
pkg-config, thus picking up the correct flags for SDL.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rwxr-xr-x | configure | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -990,18 +990,24 @@ fi ########################################## # SDL probe -sdl_too_old=no +if $pkgconfig sdl --modversion >/dev/null 2>&1; then + sdlconfig="$pkgconfig sdl" + _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'` +else + sdlconfig='sdl-config' + _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'` +fi +sdl_too_old=no if test "$sdl" != "no" ; then cat > $TMPC << EOF #include <SDL.h> #undef main /* We don't want SDL to override our main() */ int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } EOF - sdl_cflags=`sdl-config --cflags 2> /dev/null` - sdl_libs=`sdl-config --libs 2> /dev/null` + sdl_cflags=`$sdlconfig --cflags 2> /dev/null` + sdl_libs=`$sdlconfig --libs 2> /dev/null` if compile_prog "$sdl_cflags" "$sdl_libs" ; then - _sdlversion=`sdl-config --version | sed 's/[^0-9]//g'` if test "$_sdlversion" -lt 121 ; then sdl_too_old=yes else |