From 6a2e7056d989fe2cd5c6d3f55e510141812d10b0 Mon Sep 17 00:00:00 2001 From: Brendan Shanks Date: Wed, 9 May 2018 17:50:13 -0700 Subject: stun: Add support to detect OpenSSL --- README | 2 +- configure.ac | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/README b/README index 3bececd..1ccfc7c 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ Requirements glib >= 2.44 pkg-config - gnutls >= 2.12.0 + gnutls >= 2.12.0 or OpenSSL gupnp-igd >= 0.1.2 (optional) gstreamer-0.10 >= 0.10.0 (optional) gstreamer-1.0 (optional) diff --git a/configure.ac b/configure.ac index 36bd622..dcd0e5d 100644 --- a/configure.ac +++ b/configure.ac @@ -185,15 +185,28 @@ 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" PKG_CHECK_MODULES(GLIB, [$NICE_PACKAGES_PUBLIC $NICE_PACKAGES_PRIVATE]) -NICE_PACKAGES_PRIVATE="$NICE_PACKAGES_PRIVATE $GNUTLS_PACKAGES_PRIVATE" +GNUTLS_PACKAGES_PRIVATE="gnutls >= 2.12.0" +PKG_CHECK_MODULES(GNUTLS, [$GNUTLS_PACKAGES_PRIVATE], + [ + AC_DEFINE([HAVE_GNUTLS], [1], [Use GnuTLS]) + NICE_PACKAGES_PRIVATE="$NICE_PACKAGES_PRIVATE $GNUTLS_PACKAGES_PRIVATE" + ], + [ + AX_CHECK_OPENSSL( + [ + AC_DEFINE([HAVE_OPENSSL], [1], [Use OpenSSL]) + NICE_PACKAGES_PRIVATE="$NICE_PACKAGES_PRIVATE libcrypto" + ], + [ + AC_MSG_ERROR([Neither GnuTLS or OpenSSL is available]) + ] + )] +) AC_SUBST([NICE_PACKAGES_PUBLIC]) AC_SUBST([NICE_PACKAGES_PRIVATE]) -- cgit v1.2.1