lftp-devel  

Patch for gnutls >2.7 (use pkgconfig)

Jeroen Roovers
Wed, 05 Aug 2009 23:44:52 -0700

This patch has been out there[1][2] for a while now and has so far not
been included in lftp itself (I still find myself applying it to 3.7.15
and 3.99.7). Thanks should probably go to Andreas Metzler who attached
it to [1].

Kind regards,
     jer


[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=529906#10
[2] https://bugs.gentoo.org/show_bug.cgi?id=278789
  Patch kindly provided by Andreas Metzler at
  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=529906#10 -JeR


--- lftp-3.7.14/configure.ac	2009-05-15 08:22:34.000000000 +0200
+++ lftp.configure.ac	2009-06-13 12:58:39.000000000 +0200
@@ -266,9 +266,10 @@
 			with_gnutls=no;;
 esac
 if test x$with_gnutls = xyes; then
-   AM_PATH_LIBGNUTLS([1.0.0], [
+   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])
-      gnutls_version_code=`echo $libgnutls_config_version | $AWK -F. '{ printf "0x%02X%02X%02X\n",$1,$2,$3 }'`
+      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])
    ])
 fi