osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sharkd: Fix build using system Speex library (autotools) 

Change-Id: I1798f3dc76704c646d67d11533f8dc32ebab7401
Reviewed-on: https://code.wireshark.org/review/21793
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>
This commit is contained in:
João Valverde 2017-05-29 22:23:49 +01:00 committed by João Valverde
parent 7c2073a7e8
commit 1a8991e875
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -587,6 +587,10 @@ sharkd_SOURCES = \
sharkd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
if HAVE_SPEEXDSP
sharkd_CPPFLAGS += $(SPEEXDSP_CFLAGS)
endif
sharkd_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
# Libraries and plugin flags with which to link sharkd.
@ -604,6 +608,10 @@ sharkd_LDADD = \
@SYSTEMCONFIGURATION_FRAMEWORKS@ \
@COREFOUNDATION_FRAMEWORKS@
if HAVE_SPEEXDSP
sharkd_LDADD += $(SPEEXDSP_LIBS)
endif
text2pcap_SOURCES = \
text2pcap.c \
text2pcap-scanner.l \

4
sharkd_session.c
View File

@ -64,7 +64,11 @@
#include <epan/addr_resolv.h>
#include <epan/dissectors/packet-rtp.h>
#include <ui/rtp_media.h>
#ifdef HAVE_SPEEXDSP
#include <speex/speex_resampler.h>
#else
#include <codecs/speex/speex_resampler.h>
#endif /* HAVE_SPEEXDSP */
#ifdef HAVE_GEOIP
# include <GeoIP.h>