diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2017-03-31 21:23:12 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2017-04-03 11:27:13 -0400 |
| commit | 6e45d1866ea92a019b9cd18642cb43123980b0ca (patch) | |
| tree | 591a1577c31d384c4626a3a92547a6447cb83ba1 /configure.ac | |
| parent | 4c79b8659da1a627463b5b66c56ddf863801aaab (diff) | |
| download | libnice-6e45d1866ea92a019b9cd18642cb43123980b0ca.tar.gz | |
stun: Switch from gcrypt to gnutls
GLib already uses it, instead of adding another dep.
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Differential Revision: https://phabricator.freedesktop.org/D1705
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 2b4a68a..93bf1e2 100644 --- a/configure.ac +++ b/configure.ac @@ -184,14 +184,20 @@ AC_CHECK_FUNCS([poll]) AC_SUBST(LIBRT) # Dependencies + +GNUTLS_PACKAGES_PRIVATE="gnutls >= 2.12.0" +PKG_CHECK_MODULES(GNUTLS, [$GNUTLS_PACKAGES_PRIVATE]) + NICE_PACKAGES_PUBLIC="glib-2.0 >= $GLIB_REQ gio-2.0 >= $GLIB_REQ gobject-2.0 >= $GLIB_REQ" NICE_PACKAGES_PRIVATE="gthread-2.0" -NICE_PACKAGES="$NICE_PACKAGES_PUBLIC $NICE_PACKAGES_PRIVATE" + +PKG_CHECK_MODULES(GLIB, [$NICE_PACKAGES_PUBLIC $NICE_PACKAGES_PRIVATE]) + +NICE_PACKAGES_PRIVATE="$NICE_PACKAGES_PRIVATE $GNUTLS_PACKAGES_PRIVATE" + AC_SUBST([NICE_PACKAGES_PUBLIC]) AC_SUBST([NICE_PACKAGES_PRIVATE]) -AC_SUBST([NICE_PACKAGES]) -PKG_CHECK_MODULES(GLIB, [$NICE_PACKAGES]) AC_ARG_WITH(gstreamer, AS_HELP_STRING([--with-gstreamer],[build GStreamer plugin]), @@ -301,22 +307,6 @@ AC_SUBST([GUPNP_PACKAGES]) AC_SUBST(HAVE_GUPNP) AC_SUBST([UPNP_ENABLED]) -dnl libgcrypt -GCRYPT_VERSION=1.6.0 -GCRYPT_LIBVER=1 - -AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION,,AC_MSG_ERROR([[ -*** -*** libgcrypt was not found. You may want to get it from -*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/ -*** -]])) -libgcrypt=yes -AC_DEFINE_UNQUOTED(LIBGCRYPT_VERSION, "$GCRYPT_VERSION", [Version of GCRYPT we expect]) - -AC_SUBST([LIBGCRYPT_CFLAGS]) -AC_SUBST([LIBGCRYPT_LIBS]) - dnl Test coverage AC_ARG_ENABLE([coverage], [AS_HELP_STRING([--enable-coverage], |