diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-26 16:00:23 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-31 11:01:25 +0000 |
| commit | fef0ba21349c8f1434ed93766b6e35c787cbbbae (patch) | |
| tree | bc16fd42494670e292e36ba41c55ae0da95a3c99 | |
| parent | 982b60b0b64704a84cbfa6d0156187622a73c611 (diff) | |
Remove <gcrypt.h> and other remnants of gcrypt
This doesn't seem to be used for anything, and creates an artificial
dependency on gcrypt, which GNUTLS 3 no longer uses.
Verified to pass tests on Debian's gnutls26 2.12.16-1 package, but
insufficient to make tests pass on gnutls28 3.0.12-1.
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43992
Bug-Debian: http://bugs.debian.org/638420
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | wocky/Makefile.am | 2 | ||||
| -rw-r--r-- | wocky/wocky-tls.c | 1 |
3 files changed, 2 insertions, 3 deletions
@@ -12,7 +12,7 @@ wocky-configure-real: LD=$(TARGET_LD) \ LDFLAGS="$(CONFIGURE_LDFLAGS)" \ CPP=$(CONFIGURE_CPP) \ - CPPFLAGS="$(CONFIGURE_CPPFLAGS) -I$(GCRYPT_TOP)/src -I$(GPG_ERROR_TOP)/src" \ + CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \ PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \ PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \ $(WOCKY_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \ diff --git a/wocky/Makefile.am b/wocky/Makefile.am index 3dcd81a..1a15061 100644 --- a/wocky/Makefile.am +++ b/wocky/Makefile.am @@ -244,5 +244,5 @@ Android.mk: Makefile.am $(built_sources) $(built_headers) -:SOURCES $(handwritten_sources) $(built_sources) \ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFLAGS) \ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \ - -:LDFLAGS $(AM_LDFLAGS) $(GCRYPT_LIBS) \ + -:LDFLAGS $(AM_LDFLAGS) \ > $@ diff --git a/wocky/wocky-tls.c b/wocky/wocky-tls.c index 796ac47..691b25b 100644 --- a/wocky/wocky-tls.c +++ b/wocky/wocky-tls.c @@ -96,7 +96,6 @@ #include <gnutls/gnutls.h> #include <string.h> #include <errno.h> -#include <gcrypt.h> #include <sys/types.h> #include <unistd.h> enum |