diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-16 00:30:46 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-16 07:31:44 +0000 |
| commit | 2486b7e8fa6ca76f75b36dfffe0de42b4f2e8380 (patch) | |
| tree | 446d3fbcc2cb044cc96f6f90fb6b3767fef9748c /macosx-setup.sh | |
| parent | 0ad7607478d9d40628b5a4af1d2335ecc0f2e7cc (diff) | |
| download | wireshark-2486b7e8fa6ca76f75b36dfffe0de42b4f2e8380.tar.gz | |
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>
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index f260095969..a5aa2ef137 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -72,6 +72,14 @@ CMAKE_VERSION=${CMAKE_VERSION-2.8.12.2} GETTEXT_VERSION=0.18.2 GLIB_VERSION=2.36.0 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. @@ -120,17 +128,6 @@ fi # the optional libraries are required by other optional libraries. # 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 if [ "$GNUTLS_VERSION" ]; then # |