diff options
| author | Brendan Shanks <brendan.shanks@teradek.com> | 2018-05-09 17:50:13 -0700 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2018-10-21 03:32:15 -0400 |
| commit | 6a2e7056d989fe2cd5c6d3f55e510141812d10b0 (patch) | |
| tree | 70ff79427bad1313f144a4374c4c85ae38bcd3de | |
| parent | 16409ef3d2db0c010e42ee68f469930cb6f870d2 (diff) | |
| download | libnice-6a2e7056d989fe2cd5c6d3f55e510141812d10b0.tar.gz | |
stun: Add support to detect OpenSSL
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.ac | 21 |
2 files changed, 18 insertions, 5 deletions
@@ -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]) |