[asterisk-commits] kpfleming: branch markster/usersconf r40729 - in /team/markster/usersconf: ./...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Sun Aug 20 21:57:43 2006
New Revision: 40729

URL: http://svn.digium.com/view/asterisk?rev=40729&view=rev
Log:
update to trunk again

Modified:
    team/markster/usersconf/   (props changed)
    team/markster/usersconf/Makefile
    team/markster/usersconf/UPGRADE.txt
    team/markster/usersconf/apps/app_voicemail.c

Propchange: team/markster/usersconf/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Aug 20 21:57:43 2006
@@ -1,1 +1,1 @@
-/trunk:1-40725
+/trunk:1-40728

Modified: team/markster/usersconf/Makefile
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/Makefile?rev=40729&r1=40728&r2=40729&view=diff
==============================================================================
--- team/markster/usersconf/Makefile (original)
+++ team/markster/usersconf/Makefile Sun Aug 20 21:57:43 2006
@@ -197,8 +197,7 @@
 
 MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
 OTHER_SUBDIRS:=utils agi
-# Note: OTHER_SUBDIRS must be after MOD_SUBDIRS, because 'utils' uses files from 'main'
-SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
+SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
 SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)

Modified: team/markster/usersconf/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/UPGRADE.txt?rev=40729&r1=40728&r2=40729&view=diff
==============================================================================
--- team/markster/usersconf/UPGRADE.txt (original)
+++ team/markster/usersconf/UPGRADE.txt Sun Aug 20 21:57:43 2006
@@ -42,6 +42,16 @@
 If you would like to save your choices and have them applied against all
 builds, the file can be copied to '~/.asterisk.makeopts' or 
 '/etc/asterisk.makeopts'.
+
+Build Process (Makefile targets):
+
+The 'valgrind' and 'dont-optimize' targets have been removed; their functionality
+is available by enabling the DONT_OPTIMIZE setting in the 'Compiler Flags' menu
+in the menuselect tool.
+
+It is now possible to run most make targets against a single subdirectory; from
+the top level directory, for example, 'make channels' will run 'make all' in the
+'channels' subdirectory. This also is true for 'clean', 'distclean' and 'depend'.
 
 Sound (prompt) and Music On Hold files:
 

Modified: team/markster/usersconf/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/apps/app_voicemail.c?rev=40729&r1=40728&r2=40729&view=diff
==============================================================================
--- team/markster/usersconf/apps/app_voicemail.c (original)
+++ team/markster/usersconf/apps/app_voicemail.c Sun Aug 20 21:57:43 2006
@@ -396,14 +396,13 @@
 static char VM_SPOOL_DIR[PATH_MAX];
 
 static char ext_pass_cmd[128];
-#ifdef ODBC_STORAGE
+
+#if ODBC_STORAGE
 #define tdesc "Comedian Mail (Voicemail System) with ODBC Storage"
-#else
-#ifdef IMAP_STORAGE
+#elif IMAP_STORAGE
 #define tdesc "Comedian Mail (Voicemail System) with IMAP Storage"
 #else
 #define tdesc "Comedian Mail (Voicemail System)"
-#endif
 #endif
 
 static char userscontext[AST_MAX_EXTENSION] = "default";