Originally committed as revision 3190 to svn://svn.ffmpeg.org/ffmpeg/trunk
Michael Niedermayer authored on 2004/06/04 19:10:29... | ... |
@@ -867,7 +867,7 @@ EOF |
867 | 867 |
|
868 | 868 |
freetype2=no |
869 | 869 |
if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then |
870 |
- if test "`which freetype-config`" != ""; then |
|
870 |
+ if freetype-config --version >/dev/null 2>&1 ; then |
|
871 | 871 |
if $cc -o $TMPE $TMPC `freetype-config --cflags` `freetype-config --libs` > /dev/null 2>&1 ; then |
872 | 872 |
freetype2=yes |
873 | 873 |
fi |
... | ... |
@@ -885,6 +885,7 @@ EOF |
885 | 885 |
|
886 | 886 |
sdl_too_old=no |
887 | 887 |
sdl=no |
888 |
+if sdl-config --version >/dev/null 2>&1 ; then |
|
888 | 889 |
if $cc -o $TMPE `sdl-config --cflags` $TMPC `sdl-config --libs` > /dev/null 2>&1 ; then |
889 | 890 |
_sdlversion=`sdl-config --version | sed 's/[^0-9]//g'` |
890 | 891 |
if test "$_sdlversion" -lt 121 ; then |
... | ... |
@@ -893,6 +894,7 @@ else |
893 | 893 |
sdl=yes |
894 | 894 |
fi |
895 | 895 |
fi |
896 |
+fi |
|
896 | 897 |
|
897 | 898 |
case "`$cc -v 2>&1 | grep version`" in |
898 | 899 |
*gcc*) |