debian: add libsystemd-journal-dev as alternative.
Required for building on ubuntu 14.04. Change-Id: I2ebdceb1c73d093458adc05cf38629ac0b50c9e4 Reviewed-on: https://code.wireshark.org/review/29990 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
parent
6212f073d7
commit
3a0f45ea1e
|
@ -15,7 +15,7 @@ Build-Depends: lsb-release,
|
||||||
# backports-compatible.
|
# backports-compatible.
|
||||||
libgnutls28-dev (>= 3.2.14-1~) | libgnutls-dev,
|
libgnutls28-dev (>= 3.2.14-1~) | libgnutls-dev,
|
||||||
libgcrypt-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev,
|
libgcrypt-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev,
|
||||||
libmaxminddb-dev, dpkg-dev (>= 1.16.1~), libsystemd-dev,
|
libmaxminddb-dev, dpkg-dev (>= 1.16.1~), libsystemd-dev | libsystemd-journal-dev,
|
||||||
libnl-genl-3-dev [linux-any], libnl-route-3-dev [linux-any], asciidoctor,
|
libnl-genl-3-dev [linux-any], libnl-route-3-dev [linux-any], asciidoctor,
|
||||||
cmake (>= 3.5) | cmake3, libsbc-dev, libnghttp2-dev, libssh-gcrypt-dev,
|
cmake (>= 3.5) | cmake3, libsbc-dev, libnghttp2-dev, libssh-gcrypt-dev,
|
||||||
liblz4-dev, libsnappy-dev, libspandsp-dev, libxml2-dev
|
liblz4-dev, libsnappy-dev, libspandsp-dev, libxml2-dev
|
||||||
|
|
|
@ -128,6 +128,12 @@ echo "libgnutls28-dev and libgnutls-dev are unavailable" >&2
|
||||||
add_package ADDITIONAL_LIST libmaxminddb-dev ||
|
add_package ADDITIONAL_LIST libmaxminddb-dev ||
|
||||||
echo "libmaxminddb-dev is unavailable" >&2
|
echo "libmaxminddb-dev is unavailable" >&2
|
||||||
|
|
||||||
|
# libsystemd-journal-dev: Ubuntu 14.04
|
||||||
|
# libsystemd-dev: Ubuntu >= 16.04
|
||||||
|
add_package DEBDEPS_LIST libsystemd-dev ||
|
||||||
|
add_package DEBDEPS_LIST libsystemd-journal-dev ||
|
||||||
|
echo "libsystemd-dev is unavailable"
|
||||||
|
|
||||||
ACTUAL_LIST=$BASIC_LIST
|
ACTUAL_LIST=$BASIC_LIST
|
||||||
|
|
||||||
# Now arrange for optional support libraries
|
# Now arrange for optional support libraries
|
||||||
|
|
Loading…
Reference in New Issue