From ad6177df401c06bf7ff441273fa8511d65aa2f24 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 14 Apr 2008 02:07:58 +0000
Subject: [PATCH] change dependency to newly packaged libiw (closes: #3030)

SVN-Revision: 10830
---
 net/xsupplicant/Makefile | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/net/xsupplicant/Makefile b/net/xsupplicant/Makefile
index f5e11efc3..b287c8af3 100644
--- a/net/xsupplicant/Makefile
+++ b/net/xsupplicant/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,15 +10,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xsupplicant
 PKG_VERSION:=1.2.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/open1x
 PKG_MD5SUM:=75f89731b905eb8d36a52621661e1226
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_BUILD_DEPENDS:=madwifi
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,33 +23,35 @@ include $(INCLUDE_DIR)/package.mk
 define Package/xsupplicant
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libopenssl +wireless-tools
+  DEPENDS:=+libopenssl +libiw
   TITLE:=A fully compliant 802.1x authenticator
   URL:=http://open1x.sourceforge.net/
 endef
 
 define Package/xsupplicant/description
-	This software allows a GNU/Linux or BSD workstation to authenticate with 
-	a RADIUS server using 802.1x and various EAP protocols.
+ This software allows a GNU/Linux or BSD workstation to authenticate with 
+ a RADIUS server using 802.1x and various EAP protocols.
 endef
 
 define Package/xsupplicant/conffiles
 /etc/xsupplicant.conf
 endef
 
-define Build/Configure	
+CONFIGURE_ARGS+= \
+	--with-openssl="$(STAGING_DIR)/usr" \
+	--with-madwifi-path="$(STAGING_DIR)/usr/include/madwifi" \
+
+CONFIGURE_VARS+= \
+	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/madwifi" \
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
 	(cd $(PKG_BUILD_DIR); touch \
 		configure.in \
 		aclocal.m4 \
 		Makefile.in \
 		configure \
 	);
-	$(call Build/Configure/Default, \
-		--with-openssl="$(STAGING_DIR)/usr" \
-		--with-madwifi-path="$(STAGING_DIR)/usr/include/madwifi" \
-		, \
-		CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/madwifi" \
-	)
 endef
 
 define Build/Compile	
-- 
2.30.2