From b1cc056b12702435f6ebdc6ba0a8e17a41e159a0 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@balintreczey.hu>
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 <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 acinclude.m4 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'acinclude.m4')

diff --git a/acinclude.m4 b/acinclude.m4
index b9be1d29eb..8d5efd37de 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1170,6 +1170,34 @@ AC_DEFUN([AC_WIRESHARK_LIBSSH_CHECK],
 	fi
 ])
 
+#
+# AC_WIRESHARK_NGHTTP2_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_NGHTTP2_CHECK],
+[
+	want_nghttp2=defaultyes
+
+	if test "x$want_nghttp2" = "xdefaultyes"; then
+		want_nghttp2=yes
+	fi
+
+	if test "x$want_nghttp2" = "xyes"; then
+		AC_CHECK_LIB(nghttp2, nghttp2_hd_inflate_new,
+			[
+				AC_CHECK_HEADERS(nghttp2/nghttp2.h,
+					[
+						NGHTTP2_LIBS=-lnghttp2
+						AC_DEFINE(HAVE_NGHTTP2, 1, [Define to use nghttp2 library])
+						have_good_nghttp2=yes
+					],,
+				)
+			],,
+		)
+	else
+		AC_MSG_RESULT(not required)
+	fi
+])
+
 #AC_WIRESHARK_LDFLAGS_CHECK
 #
 # $1 : ldflag(s) to test
-- 
cgit v1.2.1