videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

* configure.ac.in: ffmpeg is now enabled by default. Also got rid of the --intf-win option which was deprecated.

This commit is contained in:
Gildas Bazin 2003-05-24 13:14:56 +00:00
parent 900c3a9650
commit 7d75be3f5a
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure.ac.in
View File

@ -1499,7 +1499,7 @@ then
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mpgatofixed32}"
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}"
AC_CHECK_HEADERS(mad.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libmad...]) ])
[ AC_MSG_ERROR([Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin.]) ])
AC_CHECK_LIB(mad, mad_bit_init, [
PLUGINS="${PLUGINS} mpgatofixed32"
LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -lmad" ],
@ -1521,8 +1521,8 @@ dnl
dnl ffmpeg decoder plugin
dnl
AC_ARG_ENABLE(ffmpeg,
[ --enable-ffmpeg ffmpeg codec (default disabled)])
if test "x${enable_ffmpeg}" = "xyes"
[ --enable-ffmpeg ffmpeg codec (default enabled)])
if test "x${enable_ffmpeg}" != "xno"
then
AC_ARG_WITH(ffmpeg-tree,
[ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
@ -1540,7 +1540,7 @@ then
dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
dnl linker would miserably barf on multiple definitions.
LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode}" ],
[ AC_MSG_ERROR([Cannot find libavcodec library...]) ])
[ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ])
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
fi
@ -1811,7 +1811,7 @@ dnl
dnl DV plugin
dnl
AC_ARG_ENABLE(dv,
[ --enable-dv DV decoder support (default disabled)])
[ --enable-dv DV decoder support (deprecated in favor of ffmpeg) (default disabled)])
if test "x${enable_dv}" = "xyes"
then
AC_CHECK_HEADERS(libdv/dv.h, [
@ -2806,18 +2806,6 @@ AC_ARG_ENABLE(qnx,
])
fi
dnl
dnl Windows native interface module, built with Borland C++ Builder
dnl
AC_ARG_ENABLE(intfwin,
[ --enable-intfwin Win32 interface support (default disabled)],
[ if test "x${enable_intfwin}" != "xno"
then
AC_CHECK_TOOL(BPR2MAK, bpr2mak, AC_ERROR(bpr2mak not found))
AC_CHECK_TOOL(BCMAKE, bcmake, AC_ERROR(bcmake not found))
PLUGINS="${PLUGINS} win32"
fi ])
dnl
dnl ncurses module
dnl