1From fb257e1e204c30436b3509ea3fa9f7c5fe131dc1 Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Tue, 16 Oct 2018 14:25:20 +0200 4Subject: [PATCH] build: use pkg-config to get tremor libs 5 6Use PKG_ENABLE_MODULES_VLC to enable tremor based on availability of 7ogg and vorbisidec 8 9Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 10--- 11 configure.ac | 9 +-------- 12 modules/codec/Makefile.am | 2 +- 13 2 files changed, 2 insertions(+), 9 deletions(-) 14 15diff --git a/configure.ac b/configure.ac 16index 0d3222e00f..b506d735f2 100644 17--- a/configure.ac 18+++ b/configure.ac 19@@ -2710,14 +2710,7 @@ PKG_ENABLE_MODULES_VLC([VORBIS], [], [ogg vorbis >= 1.1 vorbisenc >= 1.1], [Vorb 20 dnl 21 dnl Tremor plugin 22 dnl 23-AC_ARG_ENABLE(tremor, 24- [ --enable-tremor Tremor decoder support (default disabled)]) 25-if test "${enable_tremor}" = "yes" 26-then 27- AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [ 28- VLC_ADD_PLUGIN([tremor]) 29- ],[]) 30-fi 31+PKG_ENABLE_MODULES_VLC([TREMOR], [], [vorbisidec ogg], [Tremor decoder support], [disabled]) 32 33 dnl 34 dnl Speex plugins 35diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am 36index 075ee2a0e9..637b1d45a6 100644 37--- a/modules/codec/Makefile.am 38+++ b/modules/codec/Makefile.am 39@@ -318,7 +318,7 @@ codec_LTLIBRARIES += $(LTLIBdaala) 40 libtremor_plugin_la_SOURCES = codec/vorbis.c 41 libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor 42 libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' 43-libtremor_plugin_la_LIBADD = -lvorbisdec -logg 44+libtremor_plugin_la_LIBADD = $(TREMOR_LIBS) 45 EXTRA_LTLIBRARIES += libtremor_plugin.la 46 codec_LTLIBRARIES += $(LTLIBtremor) 47 48-- 492.17.1 50 51