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>
---
 tools/win-setup.ps1 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tools/win-setup.ps1')

diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1
index 8b8ebd3b6e..4894e6ec5b 100644
--- a/tools/win-setup.ps1
+++ b/tools/win-setup.ps1
@@ -114,6 +114,7 @@ $Win64Archives = @{
     "libssh-0.7.2-win64ws.zip" = "";
     "lua-5.2.4_Win64_dllw4_lib.zip" = "lua5.2.4";
     "nasm-2.09.08-win32.zip" = "";
+    "nghttp2-1.14.0-win64ws.zip" = "";
     "portaudio_v19_2.zip" = "";
     "upx303w.zip" = "";
     "WinSparkle-0.3-44-g2c8d9d3-win64ws.zip" = "";
@@ -132,6 +133,7 @@ $Win32Archives = @{
     "libssh-0.7.2-win32ws.zip" = "";
     "lua-5.2.4_Win32_dllw4_lib.zip" = "lua5.2.4";
     "nasm-2.09.08-win32.zip" = "";
+    "nghttp2-1.14.0-win32ws.zip" = "";
     "portaudio_v19_2.zip" = "";
     "upx303w.zip" = "";
     "WinSparkle-0.3-44-g2c8d9d3-win32ws.zip" = "";
@@ -177,6 +179,7 @@ $CleanupItems = @(
     "libsmi-svn-40773-win??ws"
     "libssh-0.7.2-win??ws"
     "nasm-2.09.08"
+    "nghttp2-*-win??ws"
     "portaudio_v19"
     "portaudio_v19_2"
     "upx301w"
-- 
cgit v1.2.1