From 77175b518c26835ab2080af4bf94335ea25c4ca5 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 4 Jul 2008 22:54:13 +0000
Subject: gnash: fix build to use external libtool

---
 packages/gnash/gnash.inc      |  2 +-
 packages/gnash/gnash_0.8.3.bb | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'packages/gnash')

diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
index 31e84b84ac..ce66beec45 100644
--- 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 383f970755..cc8de96995 100644
--- 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"
+
-- 
cgit 1.2.3-korg