diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2016-08-26 15:18:29 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-10-13 19:26:10 +0000 |
| commit | b1cc056b12702435f6ebdc6ba0a8e17a41e159a0 (patch) | |
| tree | e03028577c61da59952dd3c319aff62faf917a14 /tools | |
| parent | ad0a016bd2f7f82e4db8bbac13f959ad3bc7ecf4 (diff) | |
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>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/debian-setup.sh | 1 | ||||
| -rwxr-xr-x | tools/install_rpms_for_devel.sh | 2 | ||||
| -rwxr-xr-x | tools/macos-setup-brew.sh | 2 | ||||
| -rw-r--r-- | tools/win-setup.ps1 | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index 3dfce5f23a..96b57339e0 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -58,6 +58,7 @@ trusty) ;; *) BASIC_LIST="$BASIC_LIST libtool-bin" + ADDITIONAL_LIST="$ADDITIONAL_LIST libnghttp2-dev" ;; esac diff --git a/tools/install_rpms_for_devel.sh b/tools/install_rpms_for_devel.sh index a806d07237..5eb021723c 100755 --- a/tools/install_rpms_for_devel.sh +++ b/tools/install_rpms_for_devel.sh @@ -62,7 +62,7 @@ fi PKGS="autoconf automake libtool gcc flex bison python perl $GLIB2 $PCAP $ZLIB lua-devel lua $CARES $GTK3 $GTK2 desktop-file-utils $QT fop -asciidoc git git-review perl-podlators" +asciidoc git git-review perl-podlators libnghttp2-devel libnghttp2" echo "Run this command (as root):" echo diff --git a/tools/macos-setup-brew.sh b/tools/macos-setup-brew.sh index a24a07ebfa..cc6476cbed 100755 --- a/tools/macos-setup-brew.sh +++ b/tools/macos-setup-brew.sh @@ -25,7 +25,7 @@ brew update #install some lib need by Wireshark -brew install c-ares glib gnutls lua cmake +brew install c-ares glib gnutls lua cmake nghttp2 #install Qt5 brew install qt5 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" |