gnash: fix build to use external libtool

diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
index 31e84b8..ce66bee 100644 (file)
--- a/packages/gnash/gnash.inc
+++ b/packages/gnash/gnash.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
 HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
-DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+DEPENDS = "libtool gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \

diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb
index 383f970..cc8de96 100644 (file)
--- a/packages/gnash/gnash_0.8.3.bb
+++ b/packages/gnash/gnash_0.8.3.bb
@@ -1,6 +1,11 @@
 require gnash.inc
 
-do_configure() {
-       gnu-configize
-       oe_runconf
-}
+PR = "r2"
+
+EXTRA_OECONF += " --without-included-ltdl \
+                  --with-ltdl-include=${STAGING_INCDIR} \
+                  --with-ltdl-lib=${STAGING_LIBDIR} \
+"
+
+SRC_URI += "file://libtool-2.2.patch;patch=1"
+