aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

gcry_create_nounce is part of libgcrypt.

Browse Source 
Lack of -lgcrypt caused linking error when compiled --with-gnutls.
This commit is contained in:
witekfl 2011-04-28 18:02:00 +02:00
parent 218a2250a7
commit 5a99cca30b
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.config.in
View File

@ -70,6 +70,7 @@ INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
JW = @JW@ JW = @JW@
LIBDIR = @LIBDIR@ LIBDIR = @LIBDIR@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LOCALEDIR = @LOCALEDIR@ LOCALEDIR = @LOCALEDIR@
LUA_CFLAGS = @LUA_CFLAGS@ LUA_CFLAGS = @LUA_CFLAGS@
LUA_LIBS = @LUA_LIBS@ LUA_LIBS = @LUA_LIBS@

7
configure.in
View File

@ -1233,7 +1233,12 @@ else
EL_CONFIG(CONFIG_GNUTLS, [GNUTLS]) EL_CONFIG(CONFIG_GNUTLS, [GNUTLS])
chosen_ssl_library="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) AC_SUBST(GNUTLS_CFLAGS)
elif test "${with_gnutls-no}" != "no"; then elif test "${with_gnutls-no}" != "no"; then

2
src/network/ssl/Makefile
View File

@ -1,7 +1,7 @@
top_builddir=../../.. top_builddir=../../..
include $(top_builddir)/Makefile.config include $(top_builddir)/Makefile.config
INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) $(LIBGCRYPT_CFLAGS)
OBJS = ssl.o socket.o OBJS = ssl.o socket.o