[Astlinux-commits] SF.net SVN: astlinux:[5464] branches/1.0

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

Revision: 5464
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5464&view=rev
Author:   abelbeck
Date:     2012-02-21 22:47:00 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
asterisk, fix custom build support for app_voicemail module with IMAP_STORAGE

Modified Paths:
--------------
    branches/1.0/astlinux.config
    branches/1.0/astlinux18.config
    branches/1.0/package/asterisk/Config.in
    branches/1.0/package/asterisk/asterisk.mk

Removed Paths:
-------------
    branches/1.0/package/asterisk/voicemail_modules.conf

Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config	2012-02-21 18:03:21 UTC (rev 5463)
+++ branches/1.0/astlinux.config	2012-02-21 22:47:00 UTC (rev 5464)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5365-dirty Configuration
-# Tue Jan 10 12:48:59 2012
+# Buildroot 2011.08-svn5463-dirty Configuration
+# Tue Feb 21 16:38:52 2012
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -160,6 +160,14 @@
 # BR2_PACKAGE_ASTERISK_v1_6 is not set
 # BR2_PACKAGE_ASTERISK_v1_8 is not set
 # BR2_PACKAGE_ASTERISK_v10_0 is not set
+
+#
+# cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)
+#
+
+#
+# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
+#
 # BR2_PACKAGE_ASTERISK_MENUSELECT is not set
 BR2_PACKAGE_ASTERISK_ILBC=y
 BR2_PACKAGE_ASTERISK-AGI-AUDIOTX=y

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2012-02-21 18:03:21 UTC (rev 5463)
+++ branches/1.0/astlinux18.config	2012-02-21 22:47:00 UTC (rev 5464)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5365-dirty Configuration
-# Tue Jan 10 12:49:08 2012
+# Buildroot 2011.08-svn5463-dirty Configuration
+# Tue Feb 21 16:38:52 2012
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -160,6 +160,14 @@
 # BR2_PACKAGE_ASTERISK_v1_6 is not set
 BR2_PACKAGE_ASTERISK_v1_8=y
 # BR2_PACKAGE_ASTERISK_v10_0 is not set
+
+#
+# cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)
+#
+
+#
+# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
+#
 # BR2_PACKAGE_ASTERISK_MENUSELECT is not set
 BR2_PACKAGE_ASTERISK_ILBC=y
 BR2_PACKAGE_ASTERISK_APP_NOTIFY=y

Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in	2012-02-21 18:03:21 UTC (rev 5463)
+++ branches/1.0/package/asterisk/Config.in	2012-02-21 22:47:00 UTC (rev 5464)
@@ -42,6 +42,11 @@
 comment "cdr_mysql, app_mysql and res_config_mysql - enabled"
         depends on BR2_PACKAGE_MYSQL_CLIENT && BR2_PACKAGE_ASTERISK
 
+comment "app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)"
+        depends on !BR2_PACKAGE_UW_IMAP && BR2_PACKAGE_ASTERISK
+comment "app_voicemail=IMAP_STORAGE - enabled"
+        depends on BR2_PACKAGE_UW_IMAP && BR2_PACKAGE_ASTERISK
+
 config BR2_PACKAGE_ASTERISK_MENUSELECT
 	bool "Asterisk custom configure"
 	default n

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2012-02-21 18:03:21 UTC (rev 5463)
+++ branches/1.0/package/asterisk/asterisk.mk	2012-02-21 22:47:00 UTC (rev 5464)
@@ -85,10 +85,10 @@
  endif
 endif
 
-ifeq ($(strip $(BR2_PACKAGE_UW-IMAP)),y)
+ifeq ($(strip $(BR2_PACKAGE_UW_IMAP)),y)
 ASTERISK_EXTRAS+=uw-imap
 ASTERISK_CONFIGURE_ARGS+= \
-			--with-imap="$(BUILD_DIR)/imap-2007e" 
+			--with-imap="$(BUILD_DIR)/uw-imap-2007e" 
 endif
 
 #ifeq ($(strip $(BR2_PACKAGE_NETSNMP)),y)
@@ -216,6 +216,11 @@
 		menuselect/menuselect --enable app_mysql --enable cdr_mysql --enable res_config_mysql menuselect.makeopts; \
 	)
  endif
+ ifeq ($(strip $(BR2_PACKAGE_UW_IMAP)),y)
+	(cd $(ASTERISK_DIR); \
+		menuselect/menuselect --enable IMAP_STORAGE menuselect.makeopts; \
+	)
+ endif
 endif
 	touch $@
 
@@ -227,20 +232,6 @@
 		USER_MAKEOPTS= \
 		ASTVARRUNDIR=/var/run/asterisk
 
-ifeq ($(strip $(BR2_PACKAGE_UW-IMAP)),y)
-	mv $(ASTERISK_DIR)/apps/app_voicemail.so $(ASTERISK_DIR)/apps/app_voicemail-file.so
-	rm $(ASTERISK_DIR)/apps/app_voicemail.o
-	sed -i -e 's|^MENUSELECT_OPTS_app_voicemail=.*$$|MENUSELECT_OPTS_app_voicemail=IMAP_STORAGE|' $(ASTERISK_DIR)/menuselect.makeopts
-	PATH=$(STAGING_DIR)/bin:$$PATH \
-	$(MAKE) -C $(ASTERISK_DIR) \
-		GLOBAL_MAKEOPTS=$(BASE_DIR)/../project/astlinux/asterisk.makeopts-imap \
-		USER_MAKEOPTS=menuselect.makeopts \
-		ASTVARRUNDIR=/var/run/asterisk
-	mv $(ASTERISK_DIR)/apps/app_voicemail.so $(ASTERISK_DIR)/apps/app_voicemail_imap.so
-	mv $(ASTERISK_DIR)/apps/app_voicemail-file.so $(ASTERISK_DIR)/apps/app_voicemail.so
-	sed -i -e 's|^MENUSELECT_OPTS_app_voicemail=IMAP_STORAGE|MENUSELECT_OPTS_app_voicemail=FILE_STORAGE|' $(ASTERISK_DIR)/menuselect.makeopts
-endif
-
 $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY): $(ASTERISK_DIR)/$(ASTERISK_BINARY)
 	# mkdir -p $(TARGET_DIR)/$(ASTERISK_MODULE_DIR)
 	PATH=$(STAGING_DIR)/bin:$$PATH \
@@ -250,9 +241,6 @@
 		ASTVARRUNDIR=/var/run/asterisk \
 		SOUNDS_CACHE_DIR=$(DL_DIR) \
 		DESTDIR=$(TARGET_DIR) install samples
-ifeq ($(strip $(BR2_PACKAGE_UW-IMAP)),y)
-	cp -p $(ASTERISK_DIR)/apps/app_voicemail_imap.so $(TARGET_DIR)/$(ASTERISK_MODULE_DIR)/.
-endif
 
 	mv $(TARGET_DIR)/usr/include/asterisk.h \
 	   $(TARGET_DIR)/usr/include/asterisk \
@@ -289,10 +277,6 @@
 endif
 	$(INSTALL) -D -m 0755 package/asterisk/logger.conf $(TARGET_DIR)/stat/etc/asterisk/logger.conf
 
-ifeq ($(strip $(BR2_PACKAGE_UW-IMAP)),y)
-	cat package/asterisk/voicemail_modules.conf >> $(TARGET_DIR)/stat/etc/asterisk/modules.conf
-endif
-
 	chmod -R 750 $(TARGET_DIR)/stat/etc/asterisk
 	rm -rf $(TARGET_DIR)/etc/asterisk
 	ln -sf /tmp/etc/asterisk $(TARGET_DIR)/etc/asterisk

Deleted: branches/1.0/package/asterisk/voicemail_modules.conf
===================================================================
--- branches/1.0/package/asterisk/voicemail_modules.conf	2012-02-21 18:03:21 UTC (rev 5463)
+++ branches/1.0/package/asterisk/voicemail_modules.conf	2012-02-21 22:47:00 UTC (rev 5464)
@@ -1,6 +0,0 @@
-;
-; Load either FILE based voicemail or IMAP based voicemail, not both
-; By default, load FILE based only (automatically) and do not load IMAP based
-;
-noload => app_voicemail_imap.so
-;noload => app_voicemail.so

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