From af7691d6c7184c5982b9404e101f954ea2ebbaf6 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 26 May 2009 19:41:26 +0000
Subject: mpd, mpd-alsa: Don't search in host system includedir (QA error).

---
 recipes/musicpd/mpd-alsa_0.14.2.bb | 19 ++++++++++---------
 recipes/musicpd/mpd_0.14.2.bb      |  3 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/recipes/musicpd/mpd-alsa_0.14.2.bb b/recipes/musicpd/mpd-alsa_0.14.2.bb
index 87b59a1bcf..b3cdaf4208 100644
--- a/recipes/musicpd/mpd-alsa_0.14.2.bb
+++ b/recipes/musicpd/mpd-alsa_0.14.2.bb
@@ -24,8 +24,8 @@ INITSCRIPT_NAME = "mpd"
 EXTRA_OECONF = "\
 --enable-ogg \
 --enable-oggvorbis \
---disable-oggflac \  
---enable-flac \ 
+--disable-oggflac \
+--enable-flac \
 --enable-faad \
 --with-ao-libraries=${STAGING_LIBDIR} \
 --with-ao-includes=${STAGING_INCDIR} \
@@ -41,14 +41,15 @@ EXTRA_OECONF = "\
 --with-ogg-includes=${STAGING_INCDIR} \
 --with-vorbis-libraries=${STAGING_LIBDIR} \
 --with-vorbis-includes=${STAGING_INCDIR} \
---disable-aotest \      
---disable-alsatest \   
---disable-oggtest \    
---disable-vorbistest \      
---disable-libFLACtest \      
---disable-libOggFLACtest  \    
---disable-audiofiletest  \     
+--disable-aotest \
+--disable-alsatest \
+--disable-oggtest \
+--disable-vorbistest \
+--disable-libFLACtest \
+--disable-libOggFLACtest  \
+--disable-audiofiletest  \
 --disable-libmikmodtest \
+--with-lame-includes=${STAGING_INCDIR} \
 "
 
 do_configure_append() {
diff --git a/recipes/musicpd/mpd_0.14.2.bb b/recipes/musicpd/mpd_0.14.2.bb
index 8aed178af2..822608c817 100644
--- a/recipes/musicpd/mpd_0.14.2.bb
+++ b/recipes/musicpd/mpd_0.14.2.bb
@@ -30,7 +30,8 @@ EXTRA_OECONF = "\
         --disable-jack \
         --enable-pulse \
         --enable-mod \
-        --disable-oggflac"
+        --disable-oggflac \
+	--with-lame-includes=${STAGING_INCDIR}"
 
 do_compile_prepend() {
     find -name Makefile | xargs sed -i 's~-I/usr/include~-I${STAGING_INCDIR}~g'
-- 
cgit 1.2.3-korg