From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 18 Mar 2011 13:30:22 +0000 (+0100)
Subject: iw: depend only on libnl(-2.0) not libnl2(-2.0)
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7fd62632f1aad512cff1ae57100f6c529cce059;p=openembedded.git

iw: depend only on libnl(-2.0) not libnl2(-2.0)

Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/recipes/iw/iw_0.9.20.bb b/recipes/iw/iw_0.9.20.bb
index 0b6a768667..7048091c8f 100644
--- a/recipes/iw/iw_0.9.20.bb
+++ b/recipes/iw/iw_0.9.20.bb
@@ -3,18 +3,15 @@ HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/iw"
 SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "BSD"
-PR = "r2"
+PR = "r3"
 
-DEPENDS = "libnl2 pkgconfig"
+DEPENDS = "libnl pkgconfig"
 
 SRC_URI = " \
 	http://wireless.kernel.org/download/iw/${P}.tar.bz2 \
 	file://kill-git-version-check.patch \
 	"
-# We stage libnl2 header files not directly as they clash with libnl files. Once
-# we only use libnl2 and stage the headers at the normal place we can remove
-# this.
-CFLAGS += "-I${STAGING_INCDIR}/libnl2/ -DCONFIG_LIBNL20"
+CFLAGS += "-DCONFIG_LIBNL20"
 
 do_compile() {
 	oe_runmake