[Ffmpeg-cvslog] CVS: ffmpeg configure,1.259,1.260
Måns Rullgård CVS
mru
Wed Mar 29 01:36:09 CEST 2006
Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv5671
Modified Files:
configure
Log Message:
use sdl-config with $cross_prefix
patch by Frantisek Dvorak <valtri at users sourceforge net>
Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -r1.259 -r1.260
--- configure 28 Mar 2006 23:34:23 -0000 1.259
+++ configure 28 Mar 2006 23:36:07 -0000 1.260
@@ -1217,9 +1217,10 @@
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'`
+SDL_CONFIG="${cross_prefix}sdl-config"
+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
sdl_too_old=yes
else
@@ -1572,8 +1573,8 @@
fi
if test "$sdl" = "yes" ; then
echo "CONFIG_SDL=yes" >> config.mak
- echo "SDL_LIBS=`sdl-config --libs`" >> config.mak
- echo "SDL_CFLAGS=`sdl-config --cflags`" >> config.mak
+ echo "SDL_LIBS=`"${SDL_CONFIG}" --libs`" >> config.mak
+ echo "SDL_CFLAGS=`"${SDL_CONFIG}" --cflags`" >> config.mak
fi
if test "$texi2html" = "yes"; then
echo "BUILD_DOC=yes" >> config.mak
More information about the ffmpeg-cvslog
mailing list