From c3f6b4728e8eb7abd02b8cb0359a07eb521e4c0f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 4 Jun 2004 10:10:29 +0000 Subject: [PATCH] check for sdl-config avoid which Originally committed as revision 3190 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5008bca499..43e9e87dbe 100755 --- a/configure +++ b/configure @@ -867,7 +867,7 @@ EOF freetype2=no if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then - if test "`which freetype-config`" != ""; then + if freetype-config --version >/dev/null 2>&1 ; then if $cc -o $TMPE $TMPC `freetype-config --cflags` `freetype-config --libs` > /dev/null 2>&1 ; then freetype2=yes fi @@ -885,6 +885,7 @@ EOF sdl_too_old=no sdl=no +if sdl-config --version >/dev/null 2>&1 ; then if $cc -o $TMPE `sdl-config --cflags` $TMPC `sdl-config --libs` > /dev/null 2>&1 ; then _sdlversion=`sdl-config --version | sed 's/[^0-9]//g'` if test "$_sdlversion" -lt 121 ; then @@ -893,6 +894,7 @@ else sdl=yes fi fi +fi case "`$cc -v 2>&1 | grep version`" in *gcc*)