Move libgcrypt and libgpg-error to the set of required libraries.
We now require libgcrypt, and libgcrypt requires libgpg-error. Change-Id: Ifdf40acb11fef84485310321523500b1396736b6 Reviewed-on: https://code.wireshark.org/review/22157 Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
parent
0ad7607478
commit
2486b7e8fa
|
@ -72,6 +72,14 @@ CMAKE_VERSION=${CMAKE_VERSION-2.8.12.2}
|
||||||
GETTEXT_VERSION=0.18.2
|
GETTEXT_VERSION=0.18.2
|
||||||
GLIB_VERSION=2.36.0
|
GLIB_VERSION=2.36.0
|
||||||
PKG_CONFIG_VERSION=0.28
|
PKG_CONFIG_VERSION=0.28
|
||||||
|
#
|
||||||
|
# libgpg-error is required for libgcrypt.
|
||||||
|
#
|
||||||
|
LIBGPG_ERROR_VERSION=1.27
|
||||||
|
#
|
||||||
|
# libgcrypt is required.
|
||||||
|
#
|
||||||
|
LIBGCRYPT_VERSION=1.7.7
|
||||||
|
|
||||||
#
|
#
|
||||||
# One or more of the following libraries are required to build Wireshark.
|
# One or more of the following libraries are required to build Wireshark.
|
||||||
|
@ -120,17 +128,6 @@ fi
|
||||||
# the optional libraries are required by other optional libraries.
|
# the optional libraries are required by other optional libraries.
|
||||||
#
|
#
|
||||||
LIBSMI_VERSION=0.4.8
|
LIBSMI_VERSION=0.4.8
|
||||||
#
|
|
||||||
# libgpg-error is required for libgcrypt.
|
|
||||||
#
|
|
||||||
LIBGPG_ERROR_VERSION=1.27
|
|
||||||
#
|
|
||||||
# libgcrypt is required.
|
|
||||||
#
|
|
||||||
LIBGCRYPT_VERSION=1.7.7
|
|
||||||
#
|
|
||||||
# GnuTLS is optional.
|
|
||||||
#
|
|
||||||
GNUTLS_VERSION=3.4.17
|
GNUTLS_VERSION=3.4.17
|
||||||
if [ "$GNUTLS_VERSION" ]; then
|
if [ "$GNUTLS_VERSION" ]; then
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue