[Qemu-devel] [PATCH 1/3] Check for sdl-config before calling it

2010-01-27 Thread Loïc Minier
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 l...@dooz.org
---
 configure |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 1f6de41..27ab724 100755
--- a/configure
+++ b/configure
@@ -997,9 +997,14 @@ fi
 if $pkgconfig sdl --modversion /dev/null 21; then
   sdlconfig=$pkgconfig sdl
   _sdlversion=`$sdlconfig --modversion 2/dev/null | sed 's/[^0-9]//g'`
-else
+elif which sdl-config /dev/null 21; 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
-- 
1.6.5





Re: [Qemu-devel] [PATCH 1/3] Check for sdl-config before calling it

2010-01-27 Thread Ben Taylor
On Wed, Jan 27, 2010 at 7:10 AM, Loïc Minier l...@dooz.org wrote:
 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 l...@dooz.org
 ---
  configure |    7 ++-
  1 files changed, 6 insertions(+), 1 deletions(-)

 diff --git a/configure b/configure
 index 1f6de41..27ab724 100755
 --- a/configure
 +++ b/configure
 @@ -997,9 +997,14 @@ fi
  if $pkgconfig sdl --modversion /dev/null 21; then
   sdlconfig=$pkgconfig sdl
   _sdlversion=`$sdlconfig --modversion 2/dev/null | sed 's/[^0-9]//g'`
 -else
 +elif which sdl-config /dev/null 21; 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


Glad to see someone working on Solaris.  Wondering why you're using
the which command, when you just created a has function in the other
patch segments, and just replaced all the other instances of which.