diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2016-03-07 09:27:00 +0000 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2017-03-31 18:25:07 -0400 |
| commit | d81c0d5f535e7c335f7c7f57359a1863fbdd867e (patch) | |
| tree | 4fc1d68940f4f69618f92f89447d7dd355bf10bf | |
| parent | 6c63f74af83c0697318cc690df9ba2bd9ad677ab (diff) | |
| download | libnice-d81c0d5f535e7c335f7c7f57359a1863fbdd867e.tar.gz | |
stun: Add libgcrypt dependency
This will shortly be used to implement secure random number generation.
Differential Revision: https://phabricator.freedesktop.org/D1609
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | nice/nice.pc.in | 1 | ||||
| -rw-r--r-- | stun/Makefile.am | 9 |
4 files changed, 25 insertions, 2 deletions
@@ -20,6 +20,7 @@ Requirements pkg-config gupnp-igd >= 0.1.2 (optional) gstreamer-0.10 >= 0.10.0 (optional) + gcrypt >= 1.4.5 Build instructions ------------------ diff --git a/configure.ac b/configure.ac index 6be4010..1075610 100644 --- a/configure.ac +++ b/configure.ac @@ -301,6 +301,22 @@ AC_SUBST([GUPNP_PACKAGES]) AC_SUBST(HAVE_GUPNP) AC_SUBST([UPNP_ENABLED]) +dnl libgcrypt +GCRYPT_VERSION=1.4.5 +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], diff --git a/nice/nice.pc.in b/nice/nice.pc.in index 8805f0d..b968ca8 100644 --- a/nice/nice.pc.in +++ b/nice/nice.pc.in @@ -10,4 +10,5 @@ Version: @VERSION@ Requires: @NICE_PACKAGES_PUBLIC@ @GUPNP_PACKAGES_PUBLIC@ Requires.private: @NICE_PACKAGES_PRIVATE@ @GUPNP_PACKAGES_PRIVATE@ Libs: -L${libdir} -lnice +Libs.private: @LIBGCRYPT_LIBS@ Cflags: -I${includedir}/nice -I${includedir} diff --git a/stun/Makefile.am b/stun/Makefile.am index f90c3d4..7645be9 100644 --- a/stun/Makefile.am +++ b/stun/Makefile.am @@ -10,7 +10,12 @@ SUBDIRS = . tools tests include $(top_srcdir)/common.mk -AM_CFLAGS = -std=gnu99 -DG_LOG_DOMAIN=\"libnice-stun\" $(LIBNICE_CFLAGS) +AM_CFLAGS = \ + -std=gnu99 \ + -DG_LOG_DOMAIN=\"libnice-stun\" \ + $(LIBNICE_CFLAGS) \ + $(LIBGCRYPT_CFLAGS) \ + $(NULL) AM_CPPFLAGS = -I$(top_srcdir) if WINDOWS @@ -35,7 +40,7 @@ libstun_la_SOURCES = constants.h \ usages/turn.c usages/turn.h \ usages/timer.c usages/timer.h -libstun_la_LIBADD = $(LIBRT) +libstun_la_LIBADD = $(LIBRT) $(LIBGCRYPT_LIBS) EXTRA_DIST = win32_common.h |