--- Makefile.am.orig
+++ Makefile.am
@@ -38,7 +38,7 @@ dist-clean-local:
 	rm -rf autom4te.cache
 
 AM_CFLAGS=
-AM_LDFLAGS=
+AM_LDFLAGS=$(LIBGNUTLS_LIBS)
 
 if PRIVATE_LIBRSYNC
   BUILT_SOURCES += private_librsync
@@ -49,6 +49,7 @@ endif
 
 AM_CPPFLAGS  = -D'DBDIR="$(localstatedir)/lib/csync2"'
 AM_CPPFLAGS += -D'ETCDIR="$(sysconfdir)"'
+AM_CPPFLAGS += $(LIBGNUTLS_CFLAGS)
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)


--- configure.ac.orig	2011-07-13 11:44:06.881518761 +0200
+++ configure.ac	2011-07-13 12:25:54.160508964 +0200
@@ -78,8 +78,8 @@
 	# Check for gnuTLS.
 	##AM_PATH_LIBGNUTLS(1.0.0, , [ AC_MSG_ERROR([[gnutls not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls]]) ])
    PKG_PROG_PKG_CONFIG
-   PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0], [
-      AC_DEFINE([USE_GNUTLS], 1, [Define to 1 when using GNU TLS library])
+   PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.0], [
+      AC_DEFINE([HAVE_LIBGNUTLS], 1, [Define to 1 when using GNU TLS library])
       gnutls_version_code=`$PKG_CONFIG --modversion gnutls | $AWK -F. '{ printf "0x%02X%02X%02X\n",$1,$2,$3 }'`
       AC_DEFINE_UNQUOTED([LFTP_LIBGNUTLS_VERSION_CODE], $gnutls_version_code, [Define to libgnutls version, e.g. 0x010203 for 1.2.3])
    ])