stun: Add support to detect OpenSSL

6a2e7056 · Brendan Shanks · Olivier Crête · 16409ef3 · 6a2e7056 · 6a2e7056
Commit 6a2e7056 authored May 09, 2018 by Brendan Shanks Committed by Olivier Crête Oct 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 5 deletions

README README +1 -1

configure.ac configure.ac +17 -4

No files found.
--- 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)

--- 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])