Skip to content

V
vlc-1.1
Commit dec3c9e9 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

* Fixes for ffmpeg and mad.

parent 1f79d1e3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 93 deletions
configure
View file @ dec3c9e9
This diff is collapsed.
configure.in
View file @ dec3c9e9
...@@ -854,9 +854,9 @@ then ...@@ -854,9 +854,9 @@ then
LDFLAGS="$LDFLAGS $mad_LDFLAGS" LDFLAGS="$LDFLAGS $mad_LDFLAGS"
AC_CHECK_HEADERS(mad.h, , AC_CHECK_HEADERS(mad.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libmad...]) ]) [ AC_MSG_ERROR([Cannot find development headers for libmad...]) ])
AC_CHECK_LIB(mad, mad_bit_init, AC_CHECK_LIB(mad, mad_bit_init, [
PLUGINS="${PLUGINS} mad" PLUGINS="${PLUGINS} mad"
mad_LDFLAGS="${mad_LDFLAGS} -lmad", mad_LDFLAGS="${mad_LDFLAGS} -lmad" ],
[ AC_MSG_ERROR([Cannot find libmad library...]) ]) [ AC_MSG_ERROR([Cannot find libmad library...]) ])
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS LDFLAGS=$save_LDFLAGS
...@@ -874,7 +874,6 @@ then ...@@ -874,7 +874,6 @@ then
[ --with-ffmpeg=PATH path to ffmpeg installation],[],[]) [ --with-ffmpeg=PATH path to ffmpeg installation],[],[])
if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x" if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x"
then then
BUILTINS="${BUILTINS} ffmpeg"
ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I$with_ffmpeg/include/libffmpeg" ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I$with_ffmpeg/include/libffmpeg"
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -L$with_ffmpeg/lib" ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -L$with_ffmpeg/lib"
fi fi
...@@ -908,9 +907,9 @@ then ...@@ -908,9 +907,9 @@ then
save_LDFLAGS=$LDFLAGS save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS $ffmpeg_CFLAGS" CFLAGS="$CFLAGS $ffmpeg_CFLAGS"
LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS" LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS"
AC_CHECK_LIB(avcodec, avcodec_init, AC_CHECK_LIB(avcodec, avcodec_init, [
BUITLINS="${BUILTINS} ffmpeg" BUILTINS="${BUILTINS} ffmpeg"
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec", ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" ],
[ AC_MSG_ERROR([Cannot find libavcodec library...]) ]) [ AC_MSG_ERROR([Cannot find libavcodec library...]) ])
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS LDFLAGS=$save_LDFLAGS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment