freeswitch-stable: move module selection to Build/Configure

Currently the routine that sets up the modules.conf file resides in
Build/Prepare.

When PKG_CONFIG_DEPENDS causes a reconfiguration, Build/Prepare is not
triggered. So if another module gets selected in menuconfig, this module
would not be added to modules.conf, meaning the rebuild would fail.

Add the routine to Build/Compile to address this.

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

diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index d62740b2508aea63fbd9bcda4c400983fbb79516..97c8219fd8e1c940e8c9c00b747ed9ee1ef9c63b 100644 (file)
--- a/net/freeswitch-stable/Makefile
+++ b/net/freeswitch-stable/Makefile
@@ -949,14 +949,17 @@ define Build/Prepare
        echo '#applications/mod_random' >> $(PKG_BUILD_DIR)/modules.conf
        echo '#codecs/mod_yuv' >> $(PKG_BUILD_DIR)/modules.conf
        echo '#event_handlers/mod_event_test' >> $(PKG_BUILD_DIR)/modules.conf
+
+       $(SED) 's|$(FS_STABLE_ANCHOR)|APR_SETVAR(LDFLAGS,$(FS_STABLE_APR_LIBS) $(TARGET_LDFLAGS))|' \
+               $(PKG_BUILD_DIR)/libs/unimrcp/build/acmacros/apr.m4
+endef
+
+define Build/Configure
        $(SED) '/^#/!s/^/#/' $(PKG_BUILD_DIR)/modules.conf
        $(foreach m,$(FS_STABLE_MOD_AVAILABLE),
                $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)),
                $(SED) '/mod_$(m)$$$$/s/^#//' $(PKG_BUILD_DIR)/modules.conf))
 
-       $(SED) 's|$(FS_STABLE_ANCHOR)|APR_SETVAR(LDFLAGS,$(FS_STABLE_APR_LIBS) $(TARGET_LDFLAGS))|' \
-               $(PKG_BUILD_DIR)/libs/unimrcp/build/acmacros/apr.m4
-
 # Hack for misc-grammar - needs mod_pocketsphinx to provide grammar files
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-misc-grammar),)
 ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-pocketsphinx),)
@@ -977,6 +980,8 @@ ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-sofia),)
        $(SED) '/mod_sofia$$$$/s/^#//' $(PKG_BUILD_DIR)/modules.conf
 endif
 endif
+
+       $(call Build/Configure/Default)
 endef
 
 define Build/Compile