X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbridge-utils%2FMakefile;h=35b883884c8be454507db902c2a841f23c9dd2b5;hb=6456a706de91e6ff3309df7eef4e94acb629ea70;hp=6b249ac8683d8ae807dc0880900b4ea28b2e3a33;hpb=b24dac87ccd7efb90aa88cbbe4629e848ca0cd0e;p=openwrt-10.03%2F.git

diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index 6b249ac86..35b883884 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -1,21 +1,28 @@
 # 
-# 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.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=bridge-utils
-PKG_VERSION:=1.0.6
 PKG_RELEASE:=1
+PKG_SOURCE_URL:=@SF/bridge
+
+ifeq ($(CONFIG_LINUX_2_4),y)
+  PKG_VERSION:=1.0.6
+  PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
+endif
+
+ifeq ($(CONFIG_LINUX_2_6),y)
+  PKG_VERSION:=1.4
+  PKG_MD5SUM:=0182fcac3a2b307113bbec34e5f1c673
+endif
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/bridge
-PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,13 +30,26 @@ define Package/bridge
   SECTION:=net
   CATEGORY:=Base system
   TITLE:=Ethernet bridging configuration utility
-  DESCRIPTION:=\
-	Manage ethernet bridging: a way to connect networks together to \\\
-	form a larger network.
   URL:=http://bridge.sourceforge.net/
 endef
 
-CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)"
+define Package/bridge/description
+ Manage ethernet bridging: a way to connect networks together to 
+ form a larger network.
+endef
+
+CONFIGURE_ARGS += \
+	--with-linux-headers="$(LINUX_DIR)" \
+
+define Build/Prepare
+$(call Build/Prepare/Default)
+	( cd $(PKG_BUILD_DIR) ; \
+		[ -f ./configure ] || { \
+			ln -sf configure.in configure.ac ; \
+			autoconf ; \
+		} \
+	)
+endef
 
 define Package/bridge/install
 	$(INSTALL_DIR) $(1)/usr/sbin