From 9f8fc21b62307da7e63884b677af7e7af84cb5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 10 May 2016 19:25:38 +0100 Subject: autotools: Check for SpeexDSP system library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie07f49ec5a563f3b43a2442e05646c6a0b51ca41 Reviewed-on: https://code.wireshark.org/review/15349 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- codecs/Makefile.am | 4 ++++ codecs/Makefile.common | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'codecs') diff --git a/codecs/Makefile.am b/codecs/Makefile.am index fd93ba4eda..35d92d32a7 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -35,6 +35,10 @@ endif libwscodecs_la_SOURCES = \ $(LIBWSCODECS_SRC) +if !HAVE_SPEEXDSP +libwscodecs_la_SOURCES += speex/resample.c +endif + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html libwscodecs_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ diff --git a/codecs/Makefile.common b/codecs/Makefile.common index b97e7f8dbc..1e8b158df2 100644 --- a/codecs/Makefile.common +++ b/codecs/Makefile.common @@ -26,5 +26,4 @@ LIBWSCODECS_SRC = \ G711a/G711adecode.c \ G711u/G711udecode.c \ G722/G722decode.c \ - G726/G726decode.c \ - speex/resample.c + G726/G726decode.c -- cgit v1.2.3