From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 7 Sep 2007 18:00:08 +0000 (+0000)
Subject: proper fix for asterisk14-mysql recursive dependency, it was a faulty dependency... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0c4f3925addd1233038113a58440a16e82c49bf1;p=openwrt%2Fsvn-archive%2Fpackages.git

proper fix for asterisk14-mysql recursive dependency, it was a faulty dependency in libmysqlclient (revert [8667] & [8668], closes: #2325)

SVN-Revision: 8672
---

diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index 644066653..7a846d1da 100644
--- 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 33b49d162..afc17f77a 100644
--- 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