[Astlinux-commits] SF.net SVN: astlinux:[7093] branches/1.0/package/asterisk/asterisk.mk

[<abe...@us...>]

Revision: 7093
          http://sourceforge.net/p/astlinux/code/7093
Author:   abelbeck
Date:     2015-06-02 17:52:15 +0000 (Tue, 02 Jun 2015)
Log Message:
-----------
asterisk, fixes for building menuselect which is compatible with upstream Asterisk changes

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2015-06-02 15:16:40 UTC (rev 7092)
+++ branches/1.0/package/asterisk/asterisk.mk	2015-06-02 17:52:15 UTC (rev 7093)
@@ -164,8 +164,6 @@
 ifneq ($(ASTERISK_VERSION_SINGLE),1)
 ifneq ($(ASTERISK_VERSION_SINGLE),11)
 
-ASTERISK_EXTRAS+=host-libxml2
-
 ifeq ($(strip $(BR2_PACKAGE_PJSIP)),y)
 ASTERISK_EXTRAS+=pjsip
 ASTERISK_CONFIGURE_ARGS+= \
@@ -217,7 +215,7 @@
 
 	touch $@
 
-$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | host-pkg-config host-ncurses host-bison host-flex \
+$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | host-pkg-config host-ncurses host-bison host-flex host-libxml2 \
 			libelf ncurses zlib openssl libtool util-linux $(ASTERISK_EXTRAS)
 	(cd $(ASTERISK_DIR); rm -rf config.cache configure; \
 		./bootstrap.sh; \
@@ -238,8 +236,7 @@
 		CPPFLAGS='$(TARGET_CFLAGS)' \
 		LIBS='$(ASTERISK_LIBS)' \
 	)
-	(cd $(ASTERISK_DIR)/menuselect; rm -rf config.cache configure; \
-		./bootstrap.sh; \
+	(cd $(ASTERISK_DIR)/menuselect; \
 		$(HOST_CONFIGURE_OPTS) \
 		./configure \
 	)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.