asterisk11 + asterisk13: use system libedit

libedit now includes a pkgconfig file, meaning asterisk can detect it.
So use the system libedit instead having asterisk include an internal
copy.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index f03bc82e2b5b9d4b4889a3d87d8aeeee418617d1..b856fb46d83194333bed323afa8397c87d1ef746 100644 (file)
--- a/net/asterisk-11.x/Makefile
+++ b/net/asterisk-11.x/Makefile
@@ -99,7 +99,7 @@ define Package/asterisk11
 $(call Package/asterisk11/Default)
   TITLE:=Complete open source PBX, v$(PKG_VERSION)
   MENU:=1
-  DEPENDS:=+libopenssl +libncurses +libpopt +libpthread +libsqlite3 +librt +libuuid +zlib @!TARGET_avr32
+  DEPENDS:=+libopenssl +libedit +libncurses +libpopt +libpthread +libsqlite3 +librt +libuuid +zlib @!TARGET_avr32
   CONFLICTS:=asterisk13
 endef
 
@@ -255,6 +255,7 @@ CONFIGURE_ARGS+= \
        --with-ilbc=internal \
        --without-isdnnet \
        --without-libxml2 \
+       --with-libedit="$(STAGING_DIR)/usr" \
        --without-misdn \
        --without-nbs \
        --with-ncurses="$(STAGING_DIR)/usr" \

diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile
index 1d6ef14cd0ef30a75910ba3446f3076ba9d87655..ed0722141623fef02b99ae7028851362753a3d34 100644 (file)
--- a/net/asterisk-13.x/Makefile
+++ b/net/asterisk-13.x/Makefile
@@ -99,7 +99,7 @@ define Package/asterisk13
 $(call Package/asterisk13/Default)
   TITLE:=Complete open source PBX, v$(PKG_VERSION)
   MENU:=1
-  DEPENDS:=+jansson +libncurses +libopenssl +libpopt +libsqlite3 +libstdcpp +libuuid +libxml2 +libxslt +zlib
+  DEPENDS:=+jansson +libedit +libncurses +libopenssl +libpopt +libsqlite3 +libstdcpp +libuuid +libxml2 +libxslt +zlib
 endef
 
 define Package/asterisk13/description
@@ -198,6 +198,7 @@ CONFIGURE_ARGS+= \
        --without-nbs \
        --without-neon \
        --without-neon29 \
+       --with-libedit="$(STAGING_DIR)/usr" \
        --with-libxml2 \
        --with-ncurses="$(STAGING_DIR)/usr" \
        --without-netsnmp \