From 5a99cca30becbffdbd9d392c0100f0a094f5727c Mon Sep 17 00:00:00 2001
From: witekfl <witekfl@poczta.onet.pl>
Date: Thu, 28 Apr 2011 18:02:00 +0200
Subject: [PATCH] gcry_create_nounce is part of libgcrypt. Lack of -lgcrypt
 caused linking error when compiled --with-gnutls.

---
 Makefile.config.in       | 1 +
 configure.in             | 7 ++++++-
 src/network/ssl/Makefile | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 70285ddd..73b46397 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -70,6 +70,7 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 JW = @JW@
 LIBDIR = @LIBDIR@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LOCALEDIR = @LOCALEDIR@
 LUA_CFLAGS = @LUA_CFLAGS@
 LUA_LIBS = @LUA_LIBS@
diff --git a/configure.in b/configure.in
index 6055a0e0..d86dd090 100644
--- a/configure.in
+++ b/configure.in
@@ -1233,7 +1233,12 @@ else
 		EL_CONFIG(CONFIG_GNUTLS, [GNUTLS])
 		chosen_ssl_library="GNUTLS"
 
-		LIBS="$GNUTLS_LIBS $LIBS"
+		# gcry_create_nounce is part of libgcrypt
+		LIBGCRYPT_CFLAGS=`libgcrypt-config --cflags`
+		LIBGCRYPT_LIBS=`libgcrypt-config --libs`
+
+		LIBS="$LIBGCRYPT_LIBS $GNUTLS_LIBS $LIBS"
+		AC_SUBST(LIBGCRYPT_CFLAGS)
 		AC_SUBST(GNUTLS_CFLAGS)
 
 	elif test "${with_gnutls-no}" != "no"; then
diff --git a/src/network/ssl/Makefile b/src/network/ssl/Makefile
index 26f02c22..3edb2800 100644
--- a/src/network/ssl/Makefile
+++ b/src/network/ssl/Makefile
@@ -1,7 +1,7 @@
 top_builddir=../../..
 include $(top_builddir)/Makefile.config
 
-INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
+INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 OBJS = ssl.o socket.o