aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-05-10 19:25:38 +0100
committerJoão Valverde <j@v6e.pt>2016-05-16 14:16:41 +0000
commit9f8fc21b62307da7e63884b677af7e7af84cb5c7 (patch)
tree073a02bc6200aea9d94ae8cc874f9a2033285c7a /codecs
parentea626b5a9c53357df2e5bc48b0dc1e8f5a8df035 (diff)
autotools: Check for SpeexDSP system library
Change-Id: Ie07f49ec5a563f3b43a2442e05646c6a0b51ca41 Reviewed-on: https://code.wireshark.org/review/15349 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'codecs')
-rw-r--r--codecs/Makefile.am4
-rw-r--r--codecs/Makefile.common3
2 files changed, 5 insertions, 2 deletions
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