--- gnutls-1.4.1/tests/Makefile.am.orig	2006-08-01 11:49:16.000000000 +1000
+++ gnutls-1.4.1/tests/Makefile.am	2006-08-01 11:50:12.000000000 +1000
@@ -35,6 +35,7 @@
 openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
 tlsia_LDADD = $(LDADD) ../libextra/libgnutls-extra.la \
 	../gl/libgnu.la @LTLIBREADLINE@
+gc_LDADD = $(LDADD) $(LIBGCRYPT_LIBS)
 
 ctests = simple anonself pskself openssl gc dhepskself set_pkcs12_cred	\
 	tlsia resume certder
--- gnutls-1.4.1/tests/Makefile.in.orig	2006-08-01 11:49:21.000000000 +1000
+++ gnutls-1.4.1/tests/Makefile.in	2006-08-01 11:50:46.000000000 +1000
@@ -138,13 +138,12 @@
 	../lib/libgnutls.la libutils.la
 gc_SOURCES = gc.c
 gc_OBJECTS = gc.$(OBJEXT)
-gc_LDADD = $(LDADD)
-gc_DEPENDENCIES = ../lib/libgnutls.la ../gl/libgnu.la \
+am__DEPENDENCIES_1 = ../lib/libgnutls.la ../gl/libgnu.la \
 	../lib/libgnutls.la libutils.la
+am__DEPENDENCIES_2 =
+gc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 openssl_SOURCES = openssl.c
 openssl_OBJECTS = openssl.$(OBJEXT)
-am__DEPENDENCIES_1 = ../lib/libgnutls.la ../gl/libgnu.la \
-	../lib/libgnutls.la libutils.la
 openssl_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../libextra/libgnutls-openssl.la
 pskself_SOURCES = pskself.c
@@ -250,7 +249,6 @@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
-GREP = @GREP@
 GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
 GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -347,9 +345,15 @@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -366,30 +370,23 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
-htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
-psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -413,6 +410,7 @@
 tlsia_LDADD = $(LDADD) ../libextra/libgnutls-extra.la \
 	../gl/libgnu.la @LTLIBREADLINE@
 
+gc_LDADD = $(LDADD) $(LIBGCRYPT_LIBS)
 ctests = simple anonself pskself openssl gc dhepskself set_pkcs12_cred	\
 	tlsia resume certder