summaryrefslogtreecommitdiff
path: root/packages/neon
diff options
context:
space:
mode:
authorMichael Krelin <hacker@klever.net>2007-05-09 09:12:42 +0000
committerMichael Krelin <hacker@klever.net>2007-05-09 09:12:42 +0000
commit655739246110f752bf30833442e4d9863036f2ed (patch)
tree4c5ee645e8546e848001f4252443f51986ef8d69 /packages/neon
parenta1da152a12837b54328d9f6bae672c23815df67c (diff)
neon: force gnutls support as per bug #2280
Diffstat (limited to 'packages/neon')
-rw-r--r--packages/neon/files/gnutls-force-and-detect.patch23
-rw-r--r--packages/neon/neon_0.25.5.bb9
2 files changed, 28 insertions, 4 deletions
diff --git a/packages/neon/files/gnutls-force-and-detect.patch b/packages/neon/files/gnutls-force-and-detect.patch
new file mode 100644
index 0000000000..4c794ba138
--- /dev/null
+++ b/packages/neon/files/gnutls-force-and-detect.patch
@@ -0,0 +1,23 @@
+diff --git a/macros/neon.m4 b/macros/neon.m4
+index 01072b9..6d3258f 100644
+--- a/macros/neon.m4
++++ b/macros/neon.m4
+@@ -886,15 +886,11 @@ yes|openssl)
+ NEON_EXTRAOBJS="$NEON_EXTRAOBJS ne_openssl"
+ ;;
+ gnutls)
+- AC_MSG_ERROR([GNU TLS support is not yet complete])
++ dnl AC_MSG_ERROR([GNU TLS support is not yet complete])
+
+- AC_PATH_PROG(GNUTLS_CONFIG, libgnutls-config, no)
++ GNUTLS_CONFIG="pkg-config gnutls"
+
+- if test "$GNUTLS_CONFIG" = "no"; then
+- AC_MSG_ERROR([could not find libgnutls-config in \$PATH])
+- fi
+-
+- ne_gnutls_ver=`$GNUTLS_CONFIG --version`
++ ne_gnutls_ver=`$GNUTLS_CONFIG --modversion`
+ case $ne_gnutls_ver in
+ 1.0.?|1.0.1?|1.0.20|1.0.21)
+ AC_MSG_ERROR([GNU TLS version $ne_gnutls_ver is too old -- 1.0.22 or later required]) ;;
diff --git a/packages/neon/neon_0.25.5.bb b/packages/neon/neon_0.25.5.bb
index 08723e9bfb..f935fdb222 100644
--- a/packages/neon/neon_0.25.5.bb
+++ b/packages/neon/neon_0.25.5.bb
@@ -2,15 +2,16 @@ DESCRIPTION = "neon is an HTTP and WebDAV client library, with a C interface."
HOMEPAGE = "http://www.webdav.org/neon"
SECTION = "libs"
LICENSE = "LGPL"
-DEPENDS = "zlib libxml2 expat time"
+DEPENDS = "zlib libxml2 expat time gnutls"
-PR = "r2"
+PR = "r3"
-SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz"
+SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \
+ file://gnutls-force-and-detect.patch;patch=1"
inherit autotools binconfig lib_package pkgconfig
-EXTRA_OECONF = "--without-ssl --with-libxml2 --with-expat --enable-shared"
+EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared"
do_stage() {
autotools_stage_all