From b1cc056b12702435f6ebdc6ba0a8e17a41e159a0 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Fri, 26 Aug 2016 15:18:29 +0200 Subject: Remove nghttp2 code and use system' nghttp2 Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs Reviewed-by: Peter Wu Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'epan/Makefile.am') diff --git a/epan/Makefile.am b/epan/Makefile.am index 4dbb95022e..e9eee8e0ba 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -33,7 +33,7 @@ wslua_dir = wslua_dist_dir = wslua endif # HAVE_LIBLUA -SUBDIRS = compress crypt ftypes dfilter dissectors nghttp2 wmem $(wslua_dir) +SUBDIRS = compress crypt ftypes dfilter dissectors wmem $(wslua_dir) DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir) @@ -318,7 +318,6 @@ libwireshark_la_LIBADD = \ dissectors/libdissectors.la \ dissectors/libdirtydissectors.la \ dissectors/libfiledissectors.la \ - nghttp2/libnghttp2.la \ wmem/libwmem.la \ $(wslua_lib) \ ${top_builddir}/wiretap/libwiretap.la \ @@ -330,6 +329,7 @@ libwireshark_la_LIBADD = \ @SSL_LIBS@ \ @LIBSMI_LDFLAGS@ \ @GEOIP_LIBS@ \ + @NGHTTP2_LIBS@ \ @GLIB_LIBS@ libwireshark_la_DEPENDENCIES = \ @@ -341,7 +341,6 @@ libwireshark_la_DEPENDENCIES = \ dfilter/libdfilter.la \ dissectors/libdissectors.la \ dissectors/libdirtydissectors.la \ - nghttp2/libnghttp2.la \ wmem/libwmem.la \ $(wslua_lib) \ ${top_builddir}/wsutil/libwsutil.la \ -- cgit v1.2.3