1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00

(linux) configure fix.

This commit is contained in:
Frank Zago 2011-06-15 01:35:25 +00:00
parent 3e9b247470
commit 415b142522
2 changed files with 4 additions and 4 deletions

4
configure vendored
View File

@ -16286,7 +16286,7 @@ FFMPEG_CXXFLAGS=""
FFMPEG_LIBS=
LIBS="$LIBS `pkg-config --libs libavformat libswscale`"
CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale` $AVCODEC_DECODE_VIDEO2"
CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale`"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5
$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
@ -16424,7 +16424,7 @@ fi
FFMPEG_LIBS="$LIBS"
FFMPEG_CXXFLAGS="$CFLAGS"
FFMPEG_CXXFLAGS="$CFLAGS $AVCODEC_DECODE_VIDEO2"
LIBS=$saved_LIBS
CFLAGS=$saved_CFLAGS

View File

@ -87,14 +87,14 @@ FFMPEG_CXXFLAGS=""
FFMPEG_LIBS=
LIBS="$LIBS `pkg-config --libs libavformat libswscale`"
CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale` $AVCODEC_DECODE_VIDEO2"
CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale`"
AC_CHECK_LIB(avformat,av_open_input_file,,AC_MSG_ERROR([FFMpeg avformat library not found. Please install it.]))
AC_CHECK_LIB(swscale,sws_getContext,,AC_MSG_ERROR([FFMpeg swscale library not found. Please install it.]))
AC_CHECK_LIB(avcodec,avcodec_decode_video2,AVCODEC_DECODE_VIDEO2="-DWITH_AVCODEC_DECODE_VIDEO2",)
FFMPEG_LIBS="$LIBS"
FFMPEG_CXXFLAGS="$CFLAGS"
FFMPEG_CXXFLAGS="$CFLAGS $AVCODEC_DECODE_VIDEO2"
LIBS=$saved_LIBS
CFLAGS=$saved_CFLAGS