diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-11-21 23:52:04 +0100 |
|---|---|---|
| committer | Dario Lombardo <lomato@gmail.com> | 2016-11-23 21:50:27 +0000 |
| commit | 24f7b93dc12577b5d9d72ff4f3fe786b65c517a1 (patch) | |
| tree | ed3be6e955791411ea5d43f3110224f219bc5c23 /tools/debian-setup.sh | |
| parent | a85d1361024e9e93f3f73575d7adaef23c2a19a8 (diff) | |
debian-setup: check for both libgnutls-dev and libgnutls28-dev.
Change-Id: Ibe63e1d9b7527295223fc817889a60db79869e27
Reviewed-on: https://code.wireshark.org/review/18935
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Diffstat (limited to 'tools/debian-setup.sh')
| -rwxr-xr-x | tools/debian-setup.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index 269dcf0a9a..f38659d3ae 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -39,7 +39,7 @@ BASIC_LIST="libgtk2.0-dev libpcap-dev bison flex make automake \ ADDITIONAL_LIST="libnl-3-dev qttools5-dev qttools5-dev-tools libgtk-3-dev \ libc-ares-dev libkrb5-dev libqt5svg5-dev lynx libsmi2-dev \ portaudio19-dev asciidoc libgcrypt-dev libsbc-dev libgeoip-dev \ - libgnutls-dev qtmultimedia5-dev liblua5.2-dev libnl-cli-3-dev \ + qtmultimedia5-dev liblua5.2-dev libnl-cli-3-dev \ libparse-yapp-perl qt5-default cmake libcap-dev \ liblz4-dev libsnappy-dev" @@ -68,6 +68,11 @@ add_package ADDITIONAL_LIST libssh-gcrypt-dev || add_package ADDITIONAL_LIST libssh-dev || echo "libssh-gcrypt-dev and libssh-dev are unavailable" >&2 +# libgnutls-dev: Debian <= jessie, Ubuntu <= 16.04 +# libgnutls28-dev: Debian >= wheezy-backports, Ubuntu >= 12.04 +add_package ADDITIONAL_LIST libgnutls28-dev || +add_package ADDITIONAL_LIST libgnutls-dev || +echo "libgnutls28-dev and libgnutls-dev are unavailable" >&2 # Install basic packages apt-get install $BASIC_LIST $OPTIONS |