diff options
| author | Benoît Canet <benoit@scylladb.com> | 2016-09-26 16:25:11 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-10-17 18:28:45 +0000 |
| commit | 47649d1c7fb6ba48b805e19268a711404eb6908b (patch) | |
| tree | 603eea5969a564511df482a2d8d6a9525cfea74b /epan/Makefile.am | |
| parent | 5c42d8a24c863549166bc1d0875e87a07bedf53e (diff) | |
cql: add lz4 and snappy decompression
We do not use the STARTUP negotiation since a stream
can be captured in its middle but try to decompress
if the flag is present and fallback if it fails.
Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694
Signed-off-by: Benoît Canet <benoit@scylladb.com>
Reviewed-on: https://code.wireshark.org/review/17952
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/Makefile.am')
| -rw-r--r-- | epan/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index e9eee8e0ba..5c53b84e94 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -40,7 +40,7 @@ DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir) AM_CPPFLAGS = $(INCLUDEDIRS) -I$(builddir)/wslua $(WS_CPPFLAGS) \ $(GLIB_CFLAGS) $(LUA_CFLAGS) $(LIBGNUTLS_CFLAGS) \ $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) \ - $(KRB5_CFLAGS) + $(LZ4_CFLAGS) $(KRB5_CFLAGS) $(SNAPPY_CFLAGS) noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la @@ -323,13 +323,15 @@ libwireshark_la_LIBADD = \ ${top_builddir}/wiretap/libwiretap.la \ ${top_builddir}/wsutil/libwsutil.la \ @C_ARES_LIBS@ \ + @GEOIP_LIBS@ \ + @KRB5_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ - @KRB5_LIBS@ \ - @SSL_LIBS@ \ @LIBSMI_LDFLAGS@ \ - @GEOIP_LIBS@ \ + @LZ4_LIBS@ \ @NGHTTP2_LIBS@ \ + @SSL_LIBS@ \ + @SNAPPY_LIBS@ \ @GLIB_LIBS@ libwireshark_la_DEPENDENCIES = \ |