gnutls: remove hacks needed for autoconf 2.59

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2521 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/gnutls/gnutls.inc b/meta/packages/gnutls/gnutls.inc
index ed96e3f588d3ee4cf30332188281e109d4e057e2..ab5ba1d1d0920b5de3c79635cb0fb1320fdb5810 100644 (file)
--- a/meta/packages/gnutls/gnutls.inc
+++ b/meta/packages/gnutls/gnutls.inc
@@ -6,17 +6,12 @@ LICENSE = "LGPL"
 
 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
            file://gnutls-openssl.patch;patch=1 \
-           file://onceonly.m4 \
            file://gnutls-texinfo-euro.patch;patch=1"
 
 inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
 
-do_configure_prepend() {
-        cp ${WORKDIR}/onceonly.m4 ${S}/m4/
-}
-
 do_stage() {
     oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
     oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}

diff --git a/meta/packages/gnutls/gnutls_1.6.3.bb b/meta/packages/gnutls/gnutls_1.6.3.bb
index 68077c0c5a622372af52d9d6136aad0162dbd571..6e0f6000d36e3b5af70ae6e289da578c0cfc37af 100644 (file)
--- a/meta/packages/gnutls/gnutls_1.6.3.bb
+++ b/meta/packages/gnutls/gnutls_1.6.3.bb
@@ -1,6 +1,2 @@
 require gnutls.inc
-PR = "r1"
-
-do_configure_prepend() {
-       sed -i "s/2.60/2.59/" ${S}/configure.in
-}
+PR = "r2"