forked from osmocom/wireshark
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>
This commit is contained in:
parent
a85d136102
commit
24f7b93dc1
|
@ -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 \
|
ADDITIONAL_LIST="libnl-3-dev qttools5-dev qttools5-dev-tools libgtk-3-dev \
|
||||||
libc-ares-dev libkrb5-dev libqt5svg5-dev lynx libsmi2-dev \
|
libc-ares-dev libkrb5-dev libqt5svg5-dev lynx libsmi2-dev \
|
||||||
portaudio19-dev asciidoc libgcrypt-dev libsbc-dev libgeoip-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 \
|
libparse-yapp-perl qt5-default cmake libcap-dev \
|
||||||
liblz4-dev libsnappy-dev"
|
liblz4-dev libsnappy-dev"
|
||||||
|
|
||||||
|
@ -68,6 +68,11 @@ add_package ADDITIONAL_LIST libssh-gcrypt-dev ||
|
||||||
add_package ADDITIONAL_LIST libssh-dev ||
|
add_package ADDITIONAL_LIST libssh-dev ||
|
||||||
echo "libssh-gcrypt-dev and libssh-dev are unavailable" >&2
|
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
|
# Install basic packages
|
||||||
apt-get install $BASIC_LIST $OPTIONS
|
apt-get install $BASIC_LIST $OPTIONS
|
||||||
|
|
Loading…
Reference in New Issue