MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-26 14:13:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make ffmpeg mandatory

Browse Source
This commit is contained in:
Julien BLACHE 2009-04-05 10:06:03 +02:00
parent f5dd1bec13
commit 0187b5d405
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@ -36,7 +36,6 @@ fi
AC_DEFINE_UNQUOTED(CONFFILE,"${CONFFILE}",Where the config file is)
use_ffmpeg=true;
use_upnp=false;
use_iconv=true
@ -63,16 +62,12 @@ AC_ARG_ENABLE(musepack, AC_HELP_STRING([--enable-musepack], [Enable Musepack sup
use_musepack=true;
CPPFLAGS="${CPPFLAGS} -DMUSEPACK")
AC_ARG_ENABLE(ffmpeg, AC_HELP_STRING([--disable-ffmpeg], [Disable ffmpeg transcoding plugin]),
use_ffmpeg=false)
AC_ARG_ENABLE(upnp, AC_HELP_STRING([--enable-upnp], [Enable upnp support]),
CPPFLAGS="${CPPFLAGS} -DUPNP"; use_upnp=true;)
AM_CONDITIONAL(COND_OGGVORBIS, test x$use_oggvorbis = xtrue)
AM_CONDITIONAL(COND_FLAC, test x$use_flac = xtrue)
AM_CONDITIONAL(COND_MUSEPACK, test x$use_musepack = xtrue)
AM_CONDITIONAL(COND_FFMPEG,test x$use_ffmpeg = xtrue)
AM_CONDITIONAL(COND_UPNP,test x$use_upnp = xtrue)
AC_CHECK_FUNCS(strcasestr strsep)
@ -85,6 +80,8 @@ fi
PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6.24 ])
PKG_CHECK_MODULES(SQLITE3, [ sqlite3 ],
AC_DEFINE(HAVE_SQLITE3, 1, [define if sqlite3 is available]))
PKG_CHECK_MODULES(FFMPEG, [ libavcodec libavformat ])
PKG_CHECK_MODULES(ID3TAG, [ id3tag ])
if test x$use_oggvorbis = xtrue; then
@ -99,10 +96,6 @@ if test x$use_musepack = xtrue; then
PKG_CHECK_MODULES(TAGLIB, [ taglib_c ])
fi
if test x$use_ffmpeg = xtrue; then
PKG_CHECK_MODULES(FFMPEG, [ libavcodec libavformat ])
fi
AC_CHECK_HEADERS(getopt.h,,)
AC_CHECK_HEADERS(stdint.h,,)

2
src/plugins/Makefile.am
View File

@ -8,13 +8,11 @@ rsp_LTLIBRARIES=rsp.la
rsp_la_LDFLAGS=-module -avoid-version
rsp_la_SOURCES = compat.c rsp.c xml-rpc.c
if COND_FFMPEG
ssc_ffmpeg_LTLIBRARIES=ssc-ffmpeg.la
ssc_ffmpeg_la_CPPFLAGS = @FFMPEG_CFLAGS@
ssc_ffmpeg_la_LIBADD = @FFMPEG_LIBS@
ssc_ffmpeg_la_LDFLAGS=-module -avoid-version
ssc_ffmpeg_la_SOURCES=ssc-ffmpeg.c
endif
ssc_script_LTLIBRARIES=ssc-script.la
ssc_script_la_LDFLAGS=-module -avoid-version