[asterisk-commits] oej: branch oej/strictrouting r40390 - in /team/oej/strictrouting: ./ agi/ ap...

Fri Aug 18 09:36:23 MST 2006

Author: oej
Date: Fri Aug 18 11:36:21 2006
New Revision: 40390

URL: http://svn.digium.com/view/asterisk?rev=40390&view=rev
Log:
Reset automerge

Added:
    team/oej/strictrouting/Makefile.rules
      - copied unchanged from r40360, trunk/Makefile.rules
    team/oej/strictrouting/channels/chan_vpb.cc
      - copied unchanged from r40360, trunk/channels/chan_vpb.cc
    team/oej/strictrouting/configs/sla.conf.sample
      - copied unchanged from r40360, trunk/configs/sla.conf.sample
    team/oej/strictrouting/doc/imapstorage.txt
      - copied unchanged from r40360, trunk/doc/imapstorage.txt
    team/oej/strictrouting/doc/macroexclusive.txt
      - copied unchanged from r40360, trunk/doc/macroexclusive.txt
    team/oej/strictrouting/doc/queues-with-callback-members.txt
      - copied unchanged from r40360, trunk/doc/queues-with-callback-members.txt
    team/oej/strictrouting/include/asterisk/threadstorage.h
      - copied unchanged from r40360, trunk/include/asterisk/threadstorage.h
    team/oej/strictrouting/pbx/ael/ael-test/ael-ntest10/
      - copied from r40360, trunk/pbx/ael/ael-test/ael-ntest10/
    team/oej/strictrouting/pbx/ael/ael-test/ael-ntest10/extensions.ael
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-ntest10/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ael-ntest12/
      - copied from r40360, trunk/pbx/ael/ael-test/ael-ntest12/
    team/oej/strictrouting/pbx/ael/ael-test/ael-ntest12/extensions.ael
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-ntest12/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ael-ntest9/
      - copied from r40360, trunk/pbx/ael/ael-test/ael-ntest9/
    team/oej/strictrouting/pbx/ael/ael-test/ael-ntest9/extensions.ael
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-ntest9/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ael-test11/
      - copied from r40360, trunk/pbx/ael/ael-test/ael-test11/
    team/oej/strictrouting/pbx/ael/ael-test/ael-test11/extensions.ael
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-test11/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ael-vtest13/
      - copied from r40360, trunk/pbx/ael/ael-test/ael-vtest13/
    team/oej/strictrouting/pbx/ael/ael-test/ael-vtest13/extensions.ael
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ael-vtest13/include1.ael2
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/include1.ael2
    team/oej/strictrouting/pbx/ael/ael-test/ael-vtest13/include2.ael2
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/include2.ael2
    team/oej/strictrouting/pbx/ael/ael-test/ael-vtest13/include3.ael2
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/include3.ael2
    team/oej/strictrouting/pbx/ael/ael-test/ael-vtest13/include4.ael2
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/include4.ael2
    team/oej/strictrouting/pbx/ael/ael-test/ael-vtest13/include5.ael2
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/include5.ael2
    team/oej/strictrouting/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-ntest10
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ref.ael-ntest10
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-ntest12
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ref.ael-ntest12
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-ntest9
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ref.ael-ntest9
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test11
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ref.ael-test11
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-vtest13
      - copied unchanged from r40360, trunk/pbx/ael/ael-test/ref.ael-vtest13
    team/oej/strictrouting/pbx/kdeconsole_main.cc
      - copied unchanged from r40360, trunk/pbx/kdeconsole_main.cc
Removed:
    team/oej/strictrouting/channels/chan_vpb.c
    team/oej/strictrouting/channels/misdn/fac.c
    team/oej/strictrouting/channels/misdn/fac.h
    team/oej/strictrouting/codecs/codec_g723_1.c
    team/oej/strictrouting/codecs/g723_slin_ex.h
    team/oej/strictrouting/codecs/slin_g723_ex.h
    team/oej/strictrouting/pbx/pbx_kdeconsole_main.cc
Modified:
    team/oej/strictrouting/   (props changed)
    team/oej/strictrouting/.cleancount
    team/oej/strictrouting/CREDITS
    team/oej/strictrouting/Makefile
    team/oej/strictrouting/Makefile.moddir_rules
    team/oej/strictrouting/UPGRADE.txt
    team/oej/strictrouting/acinclude.m4
    team/oej/strictrouting/acl.c
    team/oej/strictrouting/agi/Makefile
    team/oej/strictrouting/app.c
    team/oej/strictrouting/apps/Makefile
    team/oej/strictrouting/apps/app_chanspy.c
    team/oej/strictrouting/apps/app_dial.c
    team/oej/strictrouting/apps/app_directed_pickup.c
    team/oej/strictrouting/apps/app_disa.c
    team/oej/strictrouting/apps/app_followme.c
    team/oej/strictrouting/apps/app_forkcdr.c
    team/oej/strictrouting/apps/app_macro.c
    team/oej/strictrouting/apps/app_meetme.c
    team/oej/strictrouting/apps/app_osplookup.c
    team/oej/strictrouting/apps/app_queue.c
    team/oej/strictrouting/apps/app_rpt.c
    team/oej/strictrouting/apps/app_sms.c
    team/oej/strictrouting/apps/app_speech_utils.c
    team/oej/strictrouting/apps/app_voicemail.c
    team/oej/strictrouting/apps/app_zapras.c
    team/oej/strictrouting/ast_expr2f.c
    team/oej/strictrouting/asterisk.c
    team/oej/strictrouting/autoservice.c
    team/oej/strictrouting/build_tools/menuselect-deps.in
    team/oej/strictrouting/build_tools/prep_moduledeps
    team/oej/strictrouting/cdr.c
    team/oej/strictrouting/cdr/Makefile
    team/oej/strictrouting/channel.c
    team/oej/strictrouting/channels/   (props changed)
    team/oej/strictrouting/channels/Makefile
    team/oej/strictrouting/channels/chan_agent.c
    team/oej/strictrouting/channels/chan_alsa.c
    team/oej/strictrouting/channels/chan_h323.c
    team/oej/strictrouting/channels/chan_iax2.c
    team/oej/strictrouting/channels/chan_jingle.c
    team/oej/strictrouting/channels/chan_mgcp.c
    team/oej/strictrouting/channels/chan_misdn.c
    team/oej/strictrouting/channels/chan_oss.c
    team/oej/strictrouting/channels/chan_phone.c
    team/oej/strictrouting/channels/chan_sip.c
    team/oej/strictrouting/channels/chan_skinny.c
    team/oej/strictrouting/channels/chan_zap.c
    team/oej/strictrouting/channels/iax2-parser.c
    team/oej/strictrouting/channels/iax2-provision.c
    team/oej/strictrouting/channels/misdn/Makefile
    team/oej/strictrouting/channels/misdn/chan_misdn_config.h
    team/oej/strictrouting/channels/misdn/ie.c
    team/oej/strictrouting/channels/misdn/isdn_lib.c
    team/oej/strictrouting/channels/misdn/isdn_lib.h
    team/oej/strictrouting/channels/misdn/isdn_lib_intern.h
    team/oej/strictrouting/channels/misdn/isdn_msg_parser.c
    team/oej/strictrouting/channels/misdn_config.c
    team/oej/strictrouting/cli.c
    team/oej/strictrouting/codecs/Makefile
    team/oej/strictrouting/codecs/codec_g726.c
    team/oej/strictrouting/codecs/codec_gsm.c
    team/oej/strictrouting/codecs/codec_ilbc.c
    team/oej/strictrouting/codecs/codec_lpc10.c
    team/oej/strictrouting/codecs/gsm/Makefile
    team/oej/strictrouting/codecs/gsm/src/preprocess.c
    team/oej/strictrouting/codecs/ilbc/Makefile
    team/oej/strictrouting/codecs/lpc10/Makefile
    team/oej/strictrouting/config.c
    team/oej/strictrouting/configs/alsa.conf.sample
    team/oej/strictrouting/configs/extconfig.conf.sample
    team/oej/strictrouting/configs/features.conf.sample
    team/oej/strictrouting/configs/followme.conf.sample
    team/oej/strictrouting/configs/func_odbc.conf.sample
    team/oej/strictrouting/configs/iax.conf.sample
    team/oej/strictrouting/configs/manager.conf.sample
    team/oej/strictrouting/configs/misdn.conf.sample
    team/oej/strictrouting/configs/phone.conf.sample
    team/oej/strictrouting/configs/queues.conf.sample
    team/oej/strictrouting/configs/sip.conf.sample
    team/oej/strictrouting/configs/skinny.conf.sample
    team/oej/strictrouting/configs/voicemail.conf.sample
    team/oej/strictrouting/configs/zapata.conf.sample
    team/oej/strictrouting/configure
    team/oej/strictrouting/configure.ac
    team/oej/strictrouting/contrib/init.d/rc.mandrake.zaptel
    team/oej/strictrouting/contrib/scripts/safe_asterisk
    team/oej/strictrouting/contrib/utils/zones2indications.c
    team/oej/strictrouting/db1-ast/Makefile
    team/oej/strictrouting/devicestate.c
    team/oej/strictrouting/dns.c
    team/oej/strictrouting/dnsmgr.c
    team/oej/strictrouting/doc/CODING-GUIDELINES
    team/oej/strictrouting/doc/asterisk-conf.txt
    team/oej/strictrouting/doc/channelvariables.txt
    team/oej/strictrouting/doc/enum.txt
    team/oej/strictrouting/doc/misdn.txt
    team/oej/strictrouting/doc/odbcstorage.txt
    team/oej/strictrouting/doc/realtime.txt
    team/oej/strictrouting/doc/smdi.txt
    team/oej/strictrouting/doc/speechrec.txt
    team/oej/strictrouting/enum.c
    team/oej/strictrouting/formats/Makefile
    team/oej/strictrouting/formats/format_h263.c
    team/oej/strictrouting/formats/format_ogg_vorbis.c
    team/oej/strictrouting/formats/format_wav_gsm.c
    team/oej/strictrouting/frame.c
    team/oej/strictrouting/funcs/Makefile
    team/oej/strictrouting/funcs/func_cdr.c
    team/oej/strictrouting/http.c
    team/oej/strictrouting/include/asterisk/abstract_jb.h
    team/oej/strictrouting/include/asterisk/ael_structs.h
    team/oej/strictrouting/include/asterisk/app.h
    team/oej/strictrouting/include/asterisk/autoconfig.h.in
    team/oej/strictrouting/include/asterisk/channel.h
    team/oej/strictrouting/include/asterisk/compiler.h
    team/oej/strictrouting/include/asterisk/config.h
    team/oej/strictrouting/include/asterisk/devicestate.h
    team/oej/strictrouting/include/asterisk/dns.h
    team/oej/strictrouting/include/asterisk/frame.h
    team/oej/strictrouting/include/asterisk/lock.h
    team/oej/strictrouting/include/asterisk/logger.h
    team/oej/strictrouting/include/asterisk/manager.h
    team/oej/strictrouting/include/asterisk/musiconhold.h
    team/oej/strictrouting/include/asterisk/options.h
    team/oej/strictrouting/include/asterisk/pbx.h
    team/oej/strictrouting/include/asterisk/rtp.h
    team/oej/strictrouting/include/asterisk/slinfactory.h
    team/oej/strictrouting/include/asterisk/speech.h
    team/oej/strictrouting/include/asterisk/stringfields.h
    team/oej/strictrouting/include/asterisk/utils.h
    team/oej/strictrouting/logger.c
    team/oej/strictrouting/makeopts.in
    team/oej/strictrouting/manager.c
    team/oej/strictrouting/netsock.c
    team/oej/strictrouting/pbx.c
    team/oej/strictrouting/pbx/Makefile
    team/oej/strictrouting/pbx/ael/ael-test/ael-test1/extensions.ael
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test1
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test2
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test3
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test4
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test5
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test6
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test7
    team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test8
    team/oej/strictrouting/pbx/ael/ael-test/runtests
    team/oej/strictrouting/pbx/ael/ael.flex
    team/oej/strictrouting/pbx/ael/ael.tab.c
    team/oej/strictrouting/pbx/ael/ael.tab.h
    team/oej/strictrouting/pbx/ael/ael.y
    team/oej/strictrouting/pbx/ael/ael_lex.c
    team/oej/strictrouting/pbx/dundi-parser.c
    team/oej/strictrouting/pbx/pbx_ael.c
    team/oej/strictrouting/pbx/pbx_config.c
    team/oej/strictrouting/pbx/pbx_dundi.c
    team/oej/strictrouting/pbx/pbx_gtkconsole.c
    team/oej/strictrouting/pbx/pbx_kdeconsole.cc
    team/oej/strictrouting/plc.c
    team/oej/strictrouting/res/Makefile
    team/oej/strictrouting/res/res_agi.c
    team/oej/strictrouting/res/res_config_odbc.c
    team/oej/strictrouting/res/res_config_pgsql.c
    team/oej/strictrouting/res/res_features.c
    team/oej/strictrouting/res/res_jabber.c
    team/oej/strictrouting/res/res_monitor.c
    team/oej/strictrouting/res/res_musiconhold.c
    team/oej/strictrouting/res/res_snmp.c
    team/oej/strictrouting/res/res_speech.c
    team/oej/strictrouting/rtp.c
    team/oej/strictrouting/say.c
    team/oej/strictrouting/sched.c
    team/oej/strictrouting/sha1.c
    team/oej/strictrouting/slinfactory.c
    team/oej/strictrouting/sounds/Makefile
    team/oej/strictrouting/srv.c
    team/oej/strictrouting/tdd.c
    team/oej/strictrouting/translate.c
    team/oej/strictrouting/udptl.c
    team/oej/strictrouting/ulaw.c
    team/oej/strictrouting/utils.c
    team/oej/strictrouting/utils/Makefile
    team/oej/strictrouting/utils/ael_main.c
    team/oej/strictrouting/utils/smsq.c

Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------

--- svn:ignore (original)
+++ svn:ignore Fri Aug 18 11:36:21 2006
@@ -21,3 +21,4 @@
 config.log
 makeopts.xml
 autom4te.cache
+muted

Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 18 11:36:21 2006
@@ -1,1 +1,1 @@
-/trunk:1-37247
+/trunk:1-40384

Modified: team/oej/strictrouting/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/.cleancount?rev=40390&r1=40389&r2=40390&view=diff
==============================================================================
--- team/oej/strictrouting/.cleancount (original)
+++ team/oej/strictrouting/.cleancount Fri Aug 18 11:36:21 2006
@@ -1,1 +1,1 @@
-19
+20

Modified: team/oej/strictrouting/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/CREDITS?rev=40390&r1=40389&r2=40390&view=diff
==============================================================================
--- team/oej/strictrouting/CREDITS (original)
+++ team/oej/strictrouting/CREDITS Fri Aug 18 11:36:21 2006
@@ -41,6 +41,39 @@
 	russelb at clemson.edu
 
 Anthony Minessale II - Countless big and small fixes, and relentless forward push
+also:
+app_chanspy
+app_forkcdr
+app_controlplayback
+app_while
+app_dumpchan
+app_dictate
+app_realtime
+app_macroif
+app_execif
+app_execiftime
+res_odbc
+res_config_odbc
+format_slin
+app_retrydial
+cdr_custom
+res_muxmon (now MixMonitor)
+res_sqlite
+format_mp3
+Several Features in app_dial including L(), G() and enhancements to M() and D()
+The concept design and initial implementation of dialplan functions with several examples.
+Several CDR enhancements including CDR variables.
+Attended Transfer
+One Touch Record
+Native Music On Hold
+Pluggable config backend (res_config)
+Realtime Caching options and SIP/IAX clusterability
+IAX codec preferences
+Modifications to the manager API to disable events.
+command line '-t' flag to allow recording/voicemail on nfs shares.
+#exec parser in config files.
+setvar from iax and sip peers.
+mulit-line comments in config files.
 	anthmct at yahoo.com              http://www.asterlink.com
 
 James Golovich - Innumerable contributions
@@ -131,6 +164,16 @@
 John Martin, Aupix - Improved video support in the SIP channel
 
 Steve Underwood - Provided T.38 pass through support.
+
+George Konstantoulakis - Support for Greek in voicemail added by InAccess Networks (work funded by HOL, www.hol.gr) gkon at inaccessnetworks.com
+
+Daniel Nylander - Support for Swedish and Norwegian languages in voicemail. http://www.danielnylander.se/
+
+Stojan Sljivic - An option for maximum number of messsages per mailbox in voicemail.  Also an issue with voicemail synchronization has been fixed.  GDS Partners www.gdspartners.com .  stojan.sljivic at gdspartners.com
+
+Bartosz Supczinski - Support for Polish added by DIR (www.dir.pl) Bartosz.Supczinski at dir.pl
+
+James Rothenberger - Support for IMAP storage integration added by OneBizTone LLC Work funded by University of Pennsylvania jar at onebiztone.com
 
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt

Modified: team/oej/strictrouting/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/Makefile?rev=40390&r1=40389&r2=40390&view=diff
==============================================================================
--- team/oej/strictrouting/Makefile (original)
+++ team/oej/strictrouting/Makefile Fri Aug 18 11:36:21 2006
@@ -11,7 +11,19 @@
 # the GNU General Public License
 #
 
+# All Makefiles use the following variables:
+#
+# LDFLAGS - linker flags (not libraries), used for all links
+# LIBS - additional libraries, at top-level for all links,
+#      on a single object just for that object
+# SOLINK - linker flags used only for creating shared objects (.so files),
+#      used for all .so links
+#
+
 .EXPORT_ALL_VARIABLES:
+
+#Uncomment this to see all build commands instead of 'quiet' output
+#NOISY_BUILD=yes
 
 # Create OPTIONS variable
 OPTIONS=
@@ -119,13 +131,17 @@
 GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
-ifneq ($(wildcard menuselect.makeopts),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard menuselect.makeopts),)
   include menuselect.makeopts
   include menuselect.makedeps
-endif
-
-ifneq ($(wildcard makeopts),)
+ endif
+endif
+
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard makeopts),)
   include makeopts
+ endif
 endif
 
 TOPDIR_CFLAGS=-Iinclude
@@ -218,9 +234,6 @@
   ASTCFLAGS+=-Werror -Wunused
 endif
 
-ifeq ($(shell gcc -v 2>&1 | grep 'gcc version' | cut -f3 -d' ' | cut -f1 -d.),4)
-ASTCFLAGS+=-Wno-pointer-sign
-endif
 ASTOBJ=-o asterisk
 
 ifeq ($(findstring BSD,$(OSARCH)),BSD)
@@ -238,7 +251,7 @@
 ifeq ($(OSARCH),FreeBSD)
   BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
   ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
-  LIBS+=$(shell if test  $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
+  AST_LIBS+=$(shell if test  $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 endif # FreeBSD
 
 ifeq ($(OSARCH),NetBSD)
@@ -311,13 +324,13 @@
 endif
 
 ifeq ($(OSARCH),Linux)
-  LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv  #-lnjamd
+  AST_LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv  #-lnjamd
 else
-  LIBS+=$(EDITLINE_LIB) -lm
+  AST_LIBS+=$(EDITLINE_LIB) -lm
 endif
 
 ifeq ($(OSARCH),Darwin)
-  LIBS+=-lresolv
+  AST_LIBS+=-lresolv
   ASTCFLAGS+=-D__Darwin__
   AUDIO_LIBS=-framework CoreAudio
   ASTLINK=-Wl,-dynamic
@@ -332,24 +345,24 @@
   ASTLINK=-Wl,-E 
   SOLINK=-shared -Xlinker -x
   ifeq ($(findstring BSD,$(OSARCH)),BSD)
-    SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
+    LDFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
   endif
 endif
 
 ifeq ($(OSARCH),FreeBSD)
-  LIBS+=-lcrypto
+  AST_LIBS+=-lcrypto
 endif
 
 ifeq ($(OSARCH),NetBSD)
-  LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib $(EDITLINE_LIB)
+  AST_LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib $(EDITLINE_LIB)
 endif
 
 ifeq ($(OSARCH),OpenBSD)
-  LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
+  AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
 endif
 
 ifeq ($(OSARCH),SunOS)
-  LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
+  AST_LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
   OBJS+=strcompat.o
   ASTLINK=
   SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
@@ -366,6 +379,8 @@
   HAVEDOT=no
 endif
 
+include Makefile.rules
+
 _all: all
 	@echo " +--------- Asterisk Build Complete ---------+"  
 	@echo " + Asterisk has successfully been built, but +"  
@@ -375,7 +390,7 @@
 	@echo " +               make install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: cleantest config.status menuselect.makeopts depend asterisk $(SUBDIRS)
+all: cleantest config.status menuselect.makeopts depend $(SUBDIRS) asterisk
 
 $(MOD_SUBDIRS):
 	@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
@@ -411,21 +426,25 @@
 endif
 
 editline/config.h:
-	cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
+	cd editline && unset CFLAGS AST_LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
 
 editline/libedit.a:
-	cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
+	cd editline && unset CFLAGS AST_LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
 	$(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a:
 	$(MAKE) -C db1-ast libdb1.a
 
-ifneq ($(wildcard .depend),)
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard .depend),)
   include .depend
-endif
-
-ifneq ($(wildcard .tags-depend),)
+ endif
+endif
+
+ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+ ifneq ($(wildcard .tags-depend),)
   include .tags-depend
+ endif
 endif
 
 ast_expr2.c ast_expr2.h:
@@ -484,16 +503,17 @@
 channel.o: CFLAGS+=$(ZAPTEL_INCLUDE)
 
 asterisk: include/asterisk/buildopts.h editline/libedit.a db1-ast/libdb1.a $(OBJS)
-	build_tools/make_build_h > include/asterisk/build.h.tmp
-	if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
+	@build_tools/make_build_h > include/asterisk/build.h.tmp
+	@if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
 		mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
 	fi
-	rm -f include/asterisk/build.h.tmp
-	$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
-	$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a $(LIBS)
+	@rm -f include/asterisk/build.h.tmp
+	@$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+	@echo "   [LD] $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.1 $(AST_LIBS) -> $@"
+	@$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a $(AST_LIBS)
 
 muted: muted.o
-	$(CC) $(AUDIO_LIBS) -o muted muted.o
+muted: LIBS+=$(AUDIO_LIBS)
 
 $(SUBDIRS_CLEAN_DEPEND):
 	@$(MAKE) -C $(@:-clean-depend=) clean-depend
@@ -885,14 +905,14 @@
 menuselect: menuselect/menuselect makeopts.xml
 	- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
 
-menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a
+menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a
 	@CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect menuselect
 
 mxml/libmxml.a:
-	@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
+	@cd mxml && unset CFLAGS AST_LIBS && test -f config.h || ./configure
 	$(MAKE) -C mxml libmxml.a
 
-makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml
 	@echo "Generating list of available modules ..."
 	@build_tools/prep_moduledeps > $@
 

Modified: team/oej/strictrouting/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/Makefile.moddir_rules?rev=40390&r1=40389&r2=40390&view=diff
==============================================================================
--- team/oej/strictrouting/Makefile.moddir_rules (original)
+++ team/oej/strictrouting/Makefile.moddir_rules Fri Aug 18 11:36:21 2006
@@ -11,22 +11,37 @@
 # the GNU General Public License
 #
 
-define module_o_template
+include $(ASTTOPDIR)/Makefile.rules
+
+define module_o_c_template
 $(1).o: $(1).c
-	$$(CC) -c -o $$@ $$< $$(CFLAGS) $$(MENUSELECT_OPTS_$(1):%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_INCLUDE))
+$(1).o: CFLAGS+=$$(MENUSELECT_OPTS_$(1):%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_INCLUDE))
 endef
 
-define module_so_template
-$(1).so: $(1).o
-	$$(CC) $$(SOLINK) -o $$@ $$^ $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB))
+define module_oo_cc_template
+$(1).oo: $(1).cc
+$(1).oo: CFLAGS+=$$(MENUSELECT_OPTS_$(1):%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_INCLUDE))
 endef
 
-%.o: %.c
-	$(CC) -c -o $@ $< $(CFLAGS)
+define module_so_o_template
+$(1).so: $(1).o
+$(1).so: LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB))
+$(1).so: LDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LDFLAGS))
+endef
 
-$(foreach mod,$(SELECTED_MODS),$(eval $(call module_o_template,$(mod))))
+define module_so_oo_template
+$(1).so: $(1).oo
+$(1).so: LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB))
+$(1).so: LDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LDFLAGS))
+endef
 
-$(foreach mod,$(SELECTED_MODS),$(eval $(call module_so_template,$(mod))))
+$(foreach mod,$(C_MODS),$(eval $(call module_o_c_template,$(mod))))
+
+$(foreach mod,$(C_MODS),$(eval $(call module_so_o_template,$(mod))))
+
+$(foreach mod,$(CC_MODS),$(eval $(call module_oo_cc_template,$(mod))))
+
+$(foreach mod,$(CC_MODS),$(eval $(call module_so_oo_template,$(mod))))
 
 .PHONY: clean clean-depend depend uninstall _all
 
@@ -36,7 +51,7 @@
 	rm -f .depend
 
 clean:: clean-depend
-	rm -f *.so *.o
+	rm -f *.so *.o *.oo
 
 install:: all
 	for x in $(SELECTED_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done

Modified: team/oej/strictrouting/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/UPGRADE.txt?rev=40390&r1=40389&r2=40390&view=diff
==============================================================================
--- team/oej/strictrouting/UPGRADE.txt (original)
+++ team/oej/strictrouting/UPGRADE.txt Fri Aug 18 11:36:21 2006
@@ -197,6 +197,10 @@
   exit code, the AGISTATUS variable will be set to "FAILURE" as opposed to
   "SUCCESS".
 
+* app_voicemail: The ODBC_STORAGE capability now requires the extended table format
+  previously used only by EXTENDED_ODBC_STORAGE. This means that you will need to update
+  your table format using the schema provided in doc/odbcstorage.txt
+
 Manager:
 
 * After executing the 'status' manager action, the "Status" manager events
@@ -240,6 +244,10 @@
 * Builtin transfer functionality sets the variable ${TRANSFERERNAME} in the new
   created channel. This variables holds the channel name of the transferer.
 
+* The dial plan variable PRI_CAUSE will be removed from future versions 
+  of Asterisk.
+  It is replaced by adding a cause value to the hangup() application.
+
 Functions:
 
 * The function ${CHECK_MD5()} has been deprecated in favor of using an
@@ -284,6 +292,23 @@
 
 * Support for MFC/R2 has been removed, as it has not been functional for some
   time and it has no maintainer.
+
+The G726-32 codec:
+
+* It has been determined that previous versions of Asterisk used the wrong codeword
+  packing order for G726-32 data. This version supports both available packing orders,
+  and can transcode between them. It also now selects the proper order when
+  negotiating with a SIP peer based on the codec name supplied in the SDP. However,
+  there are existing devices that improperly request one order and then use another;
+  Sipura and Grandstream ATAs are known to do this, and there may be others. To
+  be able to continue to use these devices with this version of Asterisk and the
+  G726-32 codec, a configuration parameter called 'g726nonstandard' has been added
+  to sip.conf, so that Asterisk can use the packing order expected by the device (even
+  though it requested a different order). In addition, the internal format number for
+  G726-32 has been changed, and the old number is now assigned to AAL2-G726-32. The
+  result of this is that this version of Asterisk will be able to interoperate over
+  IAX2 with older versions of Asterisk, as long as this version is told to allow
+  'g726aal2' instead of 'g726' as the codec for the call.
 
 Installation:
 
@@ -298,3 +323,42 @@
 	ASTETCDIR	/usr/local/etc/asterisk
 	ASTBINDIR	/usr/local/bin/asterisk
 	ASTSBINDIR	/usr/local/sbin/asterisk
+
+Music on Hold:
+
+* The music on hold handling has been changed in some significant ways in hopes
+  to make it work in a way that is much less confusing to users. Behavior will
+  not change if the same configuration is used from older versions of Asterisk.
+  However, there are some new configuration options that will make things work
+  in a way that makes more sense.
+
+  Previously, many of the channel drivers had an option called "musicclass" or
+  something similar. This option set what music on hold class this channel
+  would *hear* when put on hold. Some people expected (with good reason) that
+  this option was to configure what music on hold class to play when putting
+  the bridged channel on hold. This option has now been deprecated.
+
+  Two new music on hold related configuration options for channel drivers have
+  been introduced. Some channel drivers support both options, some just one,
+  and some support neither of them. Check the sample configuration files to see
+  which options apply to which channel driver.
+
+  The "mohsuggest" option specifies which music on hold class to suggest to the
+  bridged channel when putting them on hold. The only way that this class can
+  be overridden is if the bridged channel has a specific music class set that
+  was done in the dialplan using Set(CHANNEL(musicclass)=something).
+
+  The "mohinterpret" option is similar to the old "musicclass" option. It
+  specifies which music on hold class this channel would like to listen to when
+  put on hold. This music class is only effective if this channel has no music
+  class set on it from the dialplan and the bridged channel putting this one on
+  hold had no "mohsuggest" setting.
+
+  The IAX2 and Zap channel drivers have an additional feature for the
+  "mohinterpret" option. If this option is set to "passthrough", then these
+  channel drivers will pass through the HOLD message in signalling instead of
+  starting music on hold on the channel. An example for how this would be
+  useful is in an enterprise network of Asterisk servers. When one phone on one
+  server puts a phone on a different server on hold, the remote server will be
+  responsibile for playing the hold music to its local phone that was put on
+  hold instead of the far end server across the network playing the music.

Modified: team/oej/strictrouting/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/acinclude.m4?rev=40390&r1=40389&r2=40390&view=diff
==============================================================================
--- team/oej/strictrouting/acinclude.m4 (original)
+++ team/oej/strictrouting/acinclude.m4 Fri Aug 18 11:36:21 2006
@@ -56,10 +56,10 @@
       if test "x${$1_HEADER_FOUND}" = "x0" ; then
          if test ! -z "${$1_MANDATORY}" ;
          then
-            echo " ***"
-            echo " *** It appears that you do not have the $2 development package installed."
-            echo " *** Please install it to include ${$1_DESCRIP} support, or re-run configure"
-            echo " *** without explicitly specifying --with-${$1_OPTION}"
+            AC_MSG_NOTICE( ***)
+            AC_MSG_NOTICE( *** It appears that you do not have the $2 development package installed.)
+            AC_MSG_NOTICE( *** Please install it to include ${$1_DESCRIP} support, or re-run configure)
+            AC_MSG_NOTICE( *** without explicitly specifying --with-${$1_OPTION})
             exit 1
          fi
          $1_LIB=""
@@ -71,10 +71,10 @@
       fi
    elif test ! -z "${$1_MANDATORY}";
    then
-      echo "***"
-      echo "*** The ${$1_DESCRIP} installation on this system appears to be broken."
-      echo "*** Either correct the installation, or run configure"
-      echo "*** without explicitly specifying --with-${$1_OPTION}"
+      AC_MSG_NOTICE(***)
+      AC_MSG_NOTICE(*** The ${$1_DESCRIP} installation on this system appears to be broken.)
+      AC_MSG_NOTICE(*** Either correct the installation, or run configure)
+      AC_MSG_NOTICE(*** without explicitly specifying --with-${$1_OPTION})
       exit 1
    fi
 fi
@@ -84,16 +84,20 @@
 AC_DEFUN(
 [AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
    GNU_MAKE='Not Found' ;
+   GNU_MAKE_VERSION_MAJOR=0 ;
+   GNU_MAKE_VERSION_MINOR=0 ;
    for a in make gmake gnumake ; do
       if test -z "$a" ; then continue ; fi ;
       if ( sh -c "$a --version" 2> /dev/null | grep GNU  2>&1 > /dev/null ) ;  then
          GNU_MAKE=$a ;
+         GNU_MAKE_VERSION_MAJOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
+         GNU_MAKE_VERSION_MINOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2`
          break;
       fi
    done ;
 ) ;
 if test  "x$GNU_MAKE" = "xNot Found"  ; then
-   echo " *** Please install GNU make.  It is required to build Asterisk!"
+   AC_MSG_ERROR( *** Please install GNU make.  It is required to build Asterisk!)
    exit 1
 fi
 AC_SUBST([GNU_MAKE])

Modified: team/oej/strictrouting/acl.c
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/acl.c?rev=40390&r1=40389&r2=40390&view=diff
==============================================================================
--- team/oej/strictrouting/acl.c (original)
+++ team/oej/strictrouting/acl.c Fri Aug 18 11:36:21 2006
@@ -90,7 +90,7 @@
 void ast_free_ha(struct ast_ha *ha)
 {
 	struct ast_ha *hal;
-	while(ha) {
+	while (ha) {
 		hal = ha;
 		ha = ha->next;
 		free(hal);
@@ -122,9 +122,9 @@
 /*  Used in chan_sip2 templates */
 struct ast_ha *ast_duplicate_ha_list(struct ast_ha *original)
 {
-	struct ast_ha *start=original;
+	struct ast_ha *start = original;
 	struct ast_ha *ret = NULL;
-	struct ast_ha *link,*prev=NULL;
+	struct ast_ha *link, *prev = NULL;
 
 	while (start) {
 		link = ast_duplicate_ha(start);  /* Create copy of this object */
@@ -167,7 +167,7 @@
 		if (!strchr(nm, '.')) {
 			if ((sscanf(nm, "%d", &x) == 1) && (x >= 0) && (x <= 32)) {
 				y = 0;
-				for (z=0;z<x;z++) {
+				for (z = 0; z < x; z++) {
 					y >>= 1;
 					y |= 0x80000000;
 				}
@@ -208,10 +208,9 @@
 		char iabuf[INET_ADDRSTRLEN];
 		char iabuf2[INET_ADDRSTRLEN];
 		/* DEBUG */
-		ast_log(LOG_DEBUG,
-			"##### Testing %s with %s\n",
-			ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr),
-			ast_inet_ntoa(iabuf2, sizeof(iabuf2), ha->netaddr));
+		ast_copy_string(iabuf, ast_inet_ntoa(sin->sin_addr), sizeof(iabuf));
+		ast_copy_string(iabuf2, ast_inet_ntoa(ha->netaddr), sizeof(iabuf2));
+		ast_log(LOG_DEBUG, "##### Testing %s with %s\n", iabuf, iabuf2);
 		/* For each rule, if this address and the netmask = the net address
 		   apply the current rule */
 		if ((sin->sin_addr.s_addr & ha->netmask.s_addr) == ha->netaddr.s_addr)
@@ -423,3 +422,4 @@
 		return 0;
 	return -1;
 }
+

Modified: team/oej/strictrouting/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/agi/Makefile?rev=40390&r1=40389&r2=40390&view=diff
==============================================================================
--- team/oej/strictrouting/agi/Makefile (original)
+++ team/oej/strictrouting/agi/Makefile Fri Aug 18 11:36:21 2006
@@ -15,12 +15,17 @@
 
 AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
 
-LIBS=
 ifeq ($(OSARCH),SunOS)
-  LIBS=-lsocket -lnsl ../strcompat.o
+  LIBS+=-lsocket -lnsl ../strcompat.o
 endif
 
+include $(ASTTOPDIR)/Makefile.rules
+
 all: $(AGIS)
+
+eagi-test: eagi-test.o
+
+eagi-sphinx-test: eagi-sphinx-test.o
 
 install: all
 	mkdir -p $(DESTDIR)$(AGI_DIR)
@@ -29,20 +34,11 @@
 uninstall:
 	for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done
 
-eagi-test: eagi-test.o
-	$(CC) $(CFLAGS) -include ../include/autoconfig.h -o eagi-test eagi-test.o $(LIBS)
-
-eagi-sphinx-test: eagi-sphinx-test.o
-	$(CC) $(CFLAGS) -include ../include/autoconfig.h -o eagi-sphinx-test eagi-sphinx-test.o $(LIBS) 
-
 clean-depend:
 	rm -f .depend
 
 clean: clean-depend
 	rm -f *.so *.o look eagi-test eagi-sphinx-test
-
-%.so : %.o
-	$(CC) -shared -Xlinker -x -o $@ $<
 
 ifneq ($(wildcard .depend),)
 include .depend

Modified: team/oej/strictrouting/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/app.c?rev=40390&r1=40389&r2=40390&view=diff
==============================================================================
--- team/oej/strictrouting/app.c (original)
+++ team/oej/strictrouting/app.c Fri Aug 18 11:36:21 2006
@@ -65,12 +65,12 @@
 	struct tone_zone_sound *ts;
 	int res=0, x=0;
 
-	if(maxlen > size)
+	if (maxlen > size)
 		maxlen = size;
 	
-	if(!timeout && chan->pbx)
+	if (!timeout && chan->pbx)
 		timeout = chan->pbx->dtimeout;
-	else if(!timeout)
+	else if (!timeout)
 		timeout = 5;
 	
 	ts = ast_get_indication_tone(chan->zone,"dial");
@@ -99,8 +99,6 @@
 	return res;
 }
 
-
-
 /*! \param timeout set timeout to 0 for "standard" timeouts. Set timeout to -1 for 
    "ludicrous time" (essentially never times out) */
 int ast_app_getdata(struct ast_channel *c, char *prompt, char *s, int maxlen, int timeout)
@@ -128,7 +126,7 @@
 
 int ast_app_getdata_full(struct ast_channel *c, char *prompt, char *s, int maxlen, int timeout, int audiofd, int ctrlfd)
 {
-	int res,to,fto;
+	int res, to, fto;
 	if (prompt) {
 		res = ast_streamfile(c, prompt, c->language);
 		if (res < 0)
@@ -538,7 +536,7 @@
 
 	stringp = fmts;
 	strsep(&stringp, "|");
-	ast_log(LOG_DEBUG,"Recording Formats: sfmts=%s\n", fmts);
+	ast_log(LOG_DEBUG, "Recording Formats: sfmts=%s\n", fmts);
 	sfmt[0] = ast_strdupa(fmts);
 
 	while ((fmt = strsep(&stringp, "|"))) {
@@ -555,9 +553,8 @@
 		if (option_verbose > 2)
 			ast_verbose(VERBOSE_PREFIX_3 "x=%d, open writing:  %s format: %s, %p\n", x, prepend ? prependfile : recordfile, sfmt[x], others[x]);
 
-		if (!others[x]) {
+		if (!others[x])
 			break;
-		}
 	}
 
 	if (path)
@@ -705,7 +702,7 @@
 			if (!others[x])
 				break;
 			if (res > 0)
-				ast_stream_rewind(others[x], totalsilence ? totalsilence-200 : 200);
+				ast_stream_rewind(others[x], totalsilence ? totalsilence - 200 : 200);
 			ast_truncstream(others[x]);
 			ast_closestream(others[x]);
 		}
@@ -720,7 +717,7 @@
 			realfiles[x] = ast_readfile(recordfile, sfmt[x], comment, O_RDONLY, 0, 0);
 			if (!others[x] || !realfiles[x])
 				break;
-			ast_stream_rewind(others[x], totalsilence ? totalsilence-200 : 200);
+			ast_stream_rewind(others[x], totalsilence ? totalsilence - 200 : 200);
 			ast_truncstream(others[x]);
 			/* add the original file too */
 			while ((fr = ast_readframe(realfiles[x]))) {
@@ -887,7 +884,7 @@
 			else if (*scan == ')') {
 				if (paren)

[... 39854 lines stripped ...]
