From 3df547e2059b4416a266a0df9d41e47176a6061b Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 21 Feb 2008 19:52:49 +0000
Subject: libsdl-sdk: Fix configure.in and use autotools do_configure, not a
 broken imitation

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3846 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/libsdl/libsdl-sdk_1.2.11.bb | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'meta/packages/libsdl/libsdl-sdk_1.2.11.bb')

diff --git a/meta/packages/libsdl/libsdl-sdk_1.2.11.bb b/meta/packages/libsdl/libsdl-sdk_1.2.11.bb
index 3dd27325b..bcf012ef7 100644
--- a/meta/packages/libsdl/libsdl-sdk_1.2.11.bb
+++ b/meta/packages/libsdl/libsdl-sdk_1.2.11.bb
@@ -4,10 +4,11 @@ SECTION = "libs"
 LICENSE = "LGPL"
 DEPENDS = "libx11-sdk libxext-sdk libxrandr-sdk libxrender-sdk"
 RDEPENDS = "libx11-sdk libxrandr-sdk libxrender-sdk libxext-sdk"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
 	   file://acinclude.m4 \
+	   file://configure_tweak.patch;patch=1 \
 	   file://kernel-asm-page.patch;patch=1 "
 S = "${WORKDIR}/SDL-${PV}"
 
@@ -24,17 +25,6 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
 
 PARALLEL_MAKE = ""
 
-do_configure() {
-	rm -f ${S}/acinclude.m4
-	cp ${WORKDIR}/acinclude.m4 ${S}/
-	gnu-configize
-	oe_runconf
-	cd ${S}
-	# prevent libtool from linking libs against libstdc++, libgcc, ...
-	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
 do_stage() {
 	autotools_stage_all
 	install -m 0644 ${S}/build/libSDLmain.a ${STAGING_LIBDIR}
-- 
cgit v1.2.3