xsupplicant: fix compile errors related to iwlib.h

[openwrt/svn-archive/archive.git] / net / xsupplicant / Makefile

diff --git a/net/xsupplicant/Makefile b/net/xsupplicant/Makefile
index c0b980ec6ab95e3230c8c5a972af040a3403e99b..ec56621a523c5f4401d1d23aa58ebdfec578fc91 100644 (file)
--- a/net/xsupplicant/Makefile
+++ b/net/xsupplicant/Makefile
@@ -1,70 +1,73 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xsupplicant
-PKG_VERSION:=1.2.7
-PKG_RELEASE:=1
+PKG_VERSION:=1.2.8
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/open1x
-PKG_MD5SUM:=f66c49cd6e4f331d05bf83513ed91990
-PKG_CAT:=zcat
+PKG_MD5SUM:=75f89731b905eb8d36a52621661e1226
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi
 
 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
-  DESCRIPTION:=\
-       This software allows a GNU/Linux or BSD workstation to authenticate with \\\
-       a RADIUS server using 802.1x and various EAP protocols.
   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.
+endef
+
 define Package/xsupplicant/conffiles
 /etc/xsupplicant.conf
 endef
 
-define Build/Configure 
+TARGET_CFLAGS += --std=gnu99
+
+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   
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR=$(PKG_INSTALL_DIR) \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
 define Package/xsupplicant/install     
-       install -d -m0755 $(1)/etc
-       install -m0644 $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/
-       install -d -m0755 $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(1)/usr/bin/
-       install -d -m0755 $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(1)/etc/
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,xsupplicant))