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

SVN-Revision: 8672

diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index 644066653350ad63dfda9ddf02e0f39f132ed7f2..7a846d1dadf115db2ea4b02506166ad3f703846f 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 33b49d16210e04e2b94c96f82091080849e71bcf..afc17f77a6f7284998af581182e7045637efbc29 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