diff --git a/configure.ac b/configure.ac index 964f5fc..d490a48 100644 --- a/configure.ac +++ b/configure.ac @@ -49,6 +49,14 @@ if test x$BOXTYPE = xgeneric; then # don't know which version is exactly needed here... PKG_CHECK_MODULES([AVUTIL], [libavutil]) fi +if test x$BOXTYPE = xspark; then + # versions are probably not correct :-( + PKG_CHECK_MODULES([AVFORMAT], [libavformat >= 53.21.1]) + PKG_CHECK_MODULES([AVCODEC], [libavcodec >= 54.28.0]) + PKG_CHECK_MODULES([SWRESAMPLE], [libswresample]) + PKG_CHECK_MODULES([AVUTIL], [libavutil]) +fi + AC_OUTPUT([ Makefile common/Makefile diff --git a/libeplayer3/Makefile.am b/libeplayer3/Makefile.am index 0746290..dc32e1f 100644 --- a/libeplayer3/Makefile.am +++ b/libeplayer3/Makefile.am @@ -27,9 +27,14 @@ AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOUR # silence ffmpeg deprecation warnings #AM_CPPFLAGS = -Dattribute_deprecated='' -#libeplayer3_la_LIBADD = -lpthread -lavformat -lavcodec -lavutil -lz -lass -lm -lpng +AM_LDFLAGS = \ + @AVFORMAT_LIBS@ \ + @AVCODEC_LIBS@ \ + @AVUTIL_LIBS@ \ + @SWRESAMPLE_LIBS@ \ + -lpthread -lz -lass -lm -lpng -LIBEPLAYER3_LIBS = libeplayer3.la -lpthread -lavformat -lavcodec -lavutil -lswresample -lz -lass -lm -lpng +LIBEPLAYER3_LIBS = libeplayer3.la bin_PROGRAMS = eplayer3 meta eplayer3_SOURCES = tools/eplayer2.c eplayer3_LDADD = $(LIBEPLAYER3_LIBS)