proper fix for asterisk14-mysql recursive dependency, it was a faulty dependency...

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8672 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index 6440666..7a846d1 100644 (file)
--- a/libs/mysql/Makefile
+++ b/libs/mysql/Makefile
@@ -31,7 +31,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libmysqlclient
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=zlib
+  DEPENDS:=+zlib
   TITLE:=MySQL client library
   URL:=http://dev.mysql.com/
 endef

diff --git a/net/asterisk-1.4.x/Makefile b/net/asterisk-1.4.x/Makefile
index 33b49d1..afc17f7 100644 (file)
--- a/net/asterisk-1.4.x/Makefile
+++ b/net/asterisk-1.4.x/Makefile
@@ -39,9 +39,6 @@ define Package/asterisk14
 $(call Package/asterisk14/Default)
   TITLE:=Complete open source PBX
   DEPENDS:= +libltdl +libncurses +libpopt +libpthread
-ifeq ($(SDK)$(CONFIG_PACKAGE_asterisk14-mysql),)
-  DEPENDS+= +zlib
-endif
 endef
 
 define Package/asterisk14/description