From: Loïc Minier <lool@dooz.org>
Date: Thu, 28 Jan 2010 21:15:18 +0000 (+0000)
Subject: Check for sdl-config before calling it
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a0dfd8a4152ff33f98f4a94218a25c960d301114;p=qemu.git

Check for sdl-config before calling it

Check whether sdl-config is available before calling it, otherwise
./configure triggers a warning:
    ./configure: 957: sdl-config: not found

If neither the .pc file not sdl-config are present, disable SDL support.

Signed-off-by: Loïc Minier <lool@dooz.org>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/configure b/configure
index 1f6de4149f..27ab7245b2 100755
--- a/configure
+++ b/configure
@@ -997,9 +997,14 @@ fi
 if $pkgconfig sdl --modversion >/dev/null 2>&1; then
   sdlconfig="$pkgconfig sdl"
   _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
-else
+elif which sdl-config >/dev/null 2>&1; then
   sdlconfig='sdl-config'
   _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'`
+else
+  if test "$sdl" = "yes" ; then
+    feature_not_found "sdl"
+  fi
+  sdl=no
 fi
 
 sdl_too_old=no