[asterisk-commits] branch oej/codecnegotiation r27300 - in
/team/oej/codecnegotiation: ./ agi/ a...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue May 16 02:07:20 MST 2006
Author: oej
Date: Tue May 16 04:07:17 2006
New Revision: 27300
URL: http://svn.digium.com/view/asterisk?rev=27300&view=rev
Log:
Adding mithraen's patch (may 12)
Added:
team/oej/codecnegotiation/acinclude.m4
- copied unchanged from r25411, trunk/acinclude.m4
team/oej/codecnegotiation/bootstrap.sh
- copied unchanged from r25411, trunk/bootstrap.sh
team/oej/codecnegotiation/build_tools/Makefile
- copied unchanged from r25411, trunk/build_tools/Makefile
team/oej/codecnegotiation/build_tools/cflags.xml
- copied unchanged from r25411, trunk/build_tools/cflags.xml
team/oej/codecnegotiation/build_tools/get_moduledeps
- copied unchanged from r25411, trunk/build_tools/get_moduledeps
team/oej/codecnegotiation/build_tools/make_version
- copied unchanged from r25411, trunk/build_tools/make_version
team/oej/codecnegotiation/build_tools/menuselect-deps.in
- copied unchanged from r25411, trunk/build_tools/menuselect-deps.in
team/oej/codecnegotiation/build_tools/menuselect.c
- copied unchanged from r25411, trunk/build_tools/menuselect.c
team/oej/codecnegotiation/build_tools/menuselect.h
- copied unchanged from r25411, trunk/build_tools/menuselect.h
team/oej/codecnegotiation/build_tools/menuselect_curses.c
- copied unchanged from r25411, trunk/build_tools/menuselect_curses.c
team/oej/codecnegotiation/build_tools/prep_moduledeps
- copied unchanged from r25411, trunk/build_tools/prep_moduledeps
team/oej/codecnegotiation/config.guess
- copied unchanged from r25411, trunk/config.guess
team/oej/codecnegotiation/config.sub
- copied unchanged from r25411, trunk/config.sub
team/oej/codecnegotiation/configure.ac
- copied unchanged from r25411, trunk/configure.ac
team/oej/codecnegotiation/funcs/func_realtime.c
- copied unchanged from r25411, trunk/funcs/func_realtime.c
team/oej/codecnegotiation/include/asterisk/ael_structs.h
- copied unchanged from r25411, trunk/include/asterisk/ael_structs.h
team/oej/codecnegotiation/makeopts.in
- copied unchanged from r25411, trunk/makeopts.in
team/oej/codecnegotiation/mxml/ (props changed)
- copied from r25411, trunk/mxml/
team/oej/codecnegotiation/mxml/ANNOUNCEMENT
- copied unchanged from r25411, trunk/mxml/ANNOUNCEMENT
team/oej/codecnegotiation/mxml/CHANGES
- copied unchanged from r25411, trunk/mxml/CHANGES
team/oej/codecnegotiation/mxml/COPYING
- copied unchanged from r25411, trunk/mxml/COPYING
team/oej/codecnegotiation/mxml/Makefile.in
- copied unchanged from r25411, trunk/mxml/Makefile.in
team/oej/codecnegotiation/mxml/README
- copied unchanged from r25411, trunk/mxml/README
team/oej/codecnegotiation/mxml/config.h.in
- copied unchanged from r25411, trunk/mxml/config.h.in
team/oej/codecnegotiation/mxml/configure
- copied unchanged from r25411, trunk/mxml/configure
team/oej/codecnegotiation/mxml/install-sh
- copied unchanged from r25411, trunk/mxml/install-sh
team/oej/codecnegotiation/mxml/mxml-attr.c
- copied unchanged from r25411, trunk/mxml/mxml-attr.c
team/oej/codecnegotiation/mxml/mxml-entity.c
- copied unchanged from r25411, trunk/mxml/mxml-entity.c
team/oej/codecnegotiation/mxml/mxml-file.c
- copied unchanged from r25411, trunk/mxml/mxml-file.c
team/oej/codecnegotiation/mxml/mxml-index.c
- copied unchanged from r25411, trunk/mxml/mxml-index.c
team/oej/codecnegotiation/mxml/mxml-node.c
- copied unchanged from r25411, trunk/mxml/mxml-node.c
team/oej/codecnegotiation/mxml/mxml-private.c
- copied unchanged from r25411, trunk/mxml/mxml-private.c
team/oej/codecnegotiation/mxml/mxml-search.c
- copied unchanged from r25411, trunk/mxml/mxml-search.c
team/oej/codecnegotiation/mxml/mxml-set.c
- copied unchanged from r25411, trunk/mxml/mxml-set.c
team/oej/codecnegotiation/mxml/mxml-string.c
- copied unchanged from r25411, trunk/mxml/mxml-string.c
team/oej/codecnegotiation/mxml/mxml.h
- copied unchanged from r25411, trunk/mxml/mxml.h
team/oej/codecnegotiation/mxml/mxml.list.in
- copied unchanged from r25411, trunk/mxml/mxml.list.in
team/oej/codecnegotiation/mxml/mxml.pc
- copied unchanged from r25411, trunk/mxml/mxml.pc
team/oej/codecnegotiation/mxml/mxml.pc.in
- copied unchanged from r25411, trunk/mxml/mxml.pc.in
team/oej/codecnegotiation/pbx/ael/
- copied from r25411, trunk/pbx/ael/
team/oej/codecnegotiation/pbx/ael/ael-test/
- copied from r25411, trunk/pbx/ael/ael-test/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test1/
- copied from r25411, trunk/pbx/ael/ael-test/ael-test1/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test1/extensions.ael
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test1/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test2/
- copied from r25411, trunk/pbx/ael/ael-test/ael-test2/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test2/apptest.ael2
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test2/apptest.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test2/extensions.ael
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test2/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test3/
- copied from r25411, trunk/pbx/ael/ael-test/ael-test3/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test3/extensions.ael
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test3/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test3/include1.ael2
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test3/include1.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test3/include2.ael2
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test3/include2.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test3/include3.ael2
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test3/include3.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test3/include4.ael2
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test3/include4.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test3/include5.ael2
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test3/include5.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test4/
- copied from r25411, trunk/pbx/ael/ael-test/ael-test4/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test4/apptest.ael2
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test4/apptest.ael2
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test4/extensions.ael
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test4/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test5/
- copied from r25411, trunk/pbx/ael/ael-test/ael-test5/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test5/extensions.ael
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test5/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test6/
- copied from r25411, trunk/pbx/ael/ael-test/ael-test6/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test6/extensions.ael
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test6/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test7/
- copied from r25411, trunk/pbx/ael/ael-test/ael-test7/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test7/extensions.ael
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ael-test7/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test1
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ref.ael-test1
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test2
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ref.ael-test2
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test3
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ref.ael-test3
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test4
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ref.ael-test4
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test5
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ref.ael-test5
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test6
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ref.ael-test6
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test7
- copied unchanged from r25411, trunk/pbx/ael/ael-test/ref.ael-test7
team/oej/codecnegotiation/pbx/ael/ael-test/runtests
- copied unchanged from r25411, trunk/pbx/ael/ael-test/runtests
team/oej/codecnegotiation/pbx/ael/ael-test/setref
- copied unchanged from r25411, trunk/pbx/ael/ael-test/setref
team/oej/codecnegotiation/pbx/ael/ael.flex
- copied unchanged from r25411, trunk/pbx/ael/ael.flex
team/oej/codecnegotiation/pbx/ael/ael.tab.c
- copied unchanged from r25411, trunk/pbx/ael/ael.tab.c
team/oej/codecnegotiation/pbx/ael/ael.tab.h
- copied unchanged from r25411, trunk/pbx/ael/ael.tab.h
team/oej/codecnegotiation/pbx/ael/ael.y
- copied unchanged from r25411, trunk/pbx/ael/ael.y
team/oej/codecnegotiation/pbx/ael/ael_lex.c
- copied unchanged from r25411, trunk/pbx/ael/ael_lex.c
team/oej/codecnegotiation/sounds/vm-tempgreetactive.gsm
- copied unchanged from r25411, trunk/sounds/vm-tempgreetactive.gsm
team/oej/codecnegotiation/utils/ael_main.c
- copied unchanged from r25411, trunk/utils/ael_main.c
team/oej/codecnegotiation/utils/expr2.testinput
- copied unchanged from r25411, trunk/utils/expr2.testinput
Removed:
team/oej/codecnegotiation/build_tools/make_svn_branch_name
Modified:
team/oej/codecnegotiation/ (props changed)
team/oej/codecnegotiation/CREDITS
team/oej/codecnegotiation/Makefile
team/oej/codecnegotiation/README.codecnegotiation-branch
team/oej/codecnegotiation/UPGRADE.txt
team/oej/codecnegotiation/agi/Makefile
team/oej/codecnegotiation/agi/eagi-sphinx-test.c
team/oej/codecnegotiation/agi/eagi-test.c
team/oej/codecnegotiation/app.c
team/oej/codecnegotiation/apps/Makefile
team/oej/codecnegotiation/apps/app_amd.c
team/oej/codecnegotiation/apps/app_chanspy.c
team/oej/codecnegotiation/apps/app_dial.c
team/oej/codecnegotiation/apps/app_directory.c
team/oej/codecnegotiation/apps/app_dumpchan.c
team/oej/codecnegotiation/apps/app_exec.c
team/oej/codecnegotiation/apps/app_externalivr.c
team/oej/codecnegotiation/apps/app_festival.c
team/oej/codecnegotiation/apps/app_flash.c
team/oej/codecnegotiation/apps/app_ices.c
team/oej/codecnegotiation/apps/app_ivrdemo.c
team/oej/codecnegotiation/apps/app_macro.c
team/oej/codecnegotiation/apps/app_meetme.c
team/oej/codecnegotiation/apps/app_mp3.c
team/oej/codecnegotiation/apps/app_nbscat.c
team/oej/codecnegotiation/apps/app_osplookup.c
team/oej/codecnegotiation/apps/app_page.c
team/oej/codecnegotiation/apps/app_privacy.c
team/oej/codecnegotiation/apps/app_queue.c
team/oej/codecnegotiation/apps/app_realtime.c
team/oej/codecnegotiation/apps/app_rpt.c
team/oej/codecnegotiation/apps/app_senddtmf.c
team/oej/codecnegotiation/apps/app_skel.c
team/oej/codecnegotiation/apps/app_speech_utils.c
team/oej/codecnegotiation/apps/app_verbose.c
team/oej/codecnegotiation/apps/app_voicemail.c
team/oej/codecnegotiation/apps/app_while.c
team/oej/codecnegotiation/apps/app_zapbarge.c
team/oej/codecnegotiation/apps/app_zapras.c
team/oej/codecnegotiation/apps/app_zapscan.c
team/oej/codecnegotiation/ast_expr2.c
team/oej/codecnegotiation/ast_expr2.fl
team/oej/codecnegotiation/ast_expr2.h
team/oej/codecnegotiation/ast_expr2.y
team/oej/codecnegotiation/ast_expr2f.c
team/oej/codecnegotiation/asterisk.c
team/oej/codecnegotiation/build_tools/ (props changed)
team/oej/codecnegotiation/cdr.c
team/oej/codecnegotiation/cdr/Makefile
team/oej/codecnegotiation/cdr/cdr_odbc.c
team/oej/codecnegotiation/cdr/cdr_pgsql.c
team/oej/codecnegotiation/cdr/cdr_sqlite.c
team/oej/codecnegotiation/cdr/cdr_tds.c
team/oej/codecnegotiation/channel.c
team/oej/codecnegotiation/channels/Makefile
team/oej/codecnegotiation/channels/chan_agent.c
team/oej/codecnegotiation/channels/chan_alsa.c
team/oej/codecnegotiation/channels/chan_features.c
team/oej/codecnegotiation/channels/chan_h323.c
team/oej/codecnegotiation/channels/chan_iax2.c
team/oej/codecnegotiation/channels/chan_mgcp.c
team/oej/codecnegotiation/channels/chan_misdn.c
team/oej/codecnegotiation/channels/chan_nbs.c
team/oej/codecnegotiation/channels/chan_oss.c
team/oej/codecnegotiation/channels/chan_phone.c
team/oej/codecnegotiation/channels/chan_sip.c
team/oej/codecnegotiation/channels/chan_skinny.c
team/oej/codecnegotiation/channels/chan_vpb.c
team/oej/codecnegotiation/channels/chan_zap.c
team/oej/codecnegotiation/channels/h323/Makefile
team/oej/codecnegotiation/channels/misdn/chan_misdn_config.h
team/oej/codecnegotiation/channels/misdn/isdn_lib.c
team/oej/codecnegotiation/channels/misdn/isdn_lib.h
team/oej/codecnegotiation/channels/misdn/isdn_lib_intern.h
team/oej/codecnegotiation/channels/misdn/isdn_msg_parser.c
team/oej/codecnegotiation/channels/misdn_config.c
team/oej/codecnegotiation/cli.c
team/oej/codecnegotiation/codecs/Makefile
team/oej/codecnegotiation/codecs/codec_a_mu.c
team/oej/codecnegotiation/codecs/codec_alaw.c
team/oej/codecnegotiation/codecs/codec_gsm.c
team/oej/codecnegotiation/codecs/codec_speex.c
team/oej/codecnegotiation/codecs/codec_ulaw.c
team/oej/codecnegotiation/codecs/gsm/Makefile
team/oej/codecnegotiation/codecs/ilbc/Makefile
team/oej/codecnegotiation/codecs/lpc10/Makefile
team/oej/codecnegotiation/configs/extensions.ael.sample
team/oej/codecnegotiation/configs/extensions.conf.sample
team/oej/codecnegotiation/configs/func_odbc.conf.sample
team/oej/codecnegotiation/configs/mgcp.conf.sample
team/oej/codecnegotiation/configs/misdn.conf.sample
team/oej/codecnegotiation/configs/queues.conf.sample
team/oej/codecnegotiation/configs/sip.conf.sample
team/oej/codecnegotiation/configs/voicemail.conf.sample
team/oej/codecnegotiation/configs/zapata.conf.sample
team/oej/codecnegotiation/cryptostub.c
team/oej/codecnegotiation/db1-ast/Makefile
team/oej/codecnegotiation/db1-ast/hash/hash.c
team/oej/codecnegotiation/devicestate.c
team/oej/codecnegotiation/doc/ael.txt
team/oej/codecnegotiation/doc/asterisk-conf.txt
team/oej/codecnegotiation/doc/channelvariables.txt
team/oej/codecnegotiation/doc/iax.txt
team/oej/codecnegotiation/doc/manager.txt
team/oej/codecnegotiation/doc/queuelog.txt
team/oej/codecnegotiation/doc/smdi.txt
team/oej/codecnegotiation/editline/configure
team/oej/codecnegotiation/editline/makelist
team/oej/codecnegotiation/file.c
team/oej/codecnegotiation/formats/Makefile
team/oej/codecnegotiation/formats/format_ogg_vorbis.c
team/oej/codecnegotiation/frame.c
team/oej/codecnegotiation/funcs/Makefile
team/oej/codecnegotiation/funcs/func_channel.c
team/oej/codecnegotiation/funcs/func_curl.c
team/oej/codecnegotiation/funcs/func_odbc.c
team/oej/codecnegotiation/http.c
team/oej/codecnegotiation/include/ (props changed)
team/oej/codecnegotiation/include/asterisk.h
team/oej/codecnegotiation/include/asterisk/app.h
team/oej/codecnegotiation/include/asterisk/astmm.h
team/oej/codecnegotiation/include/asterisk/cdr.h
team/oej/codecnegotiation/include/asterisk/channel.h
team/oej/codecnegotiation/include/asterisk/compat.h
team/oej/codecnegotiation/include/asterisk/devicestate.h
team/oej/codecnegotiation/include/asterisk/frame.h
team/oej/codecnegotiation/include/asterisk/manager.h
team/oej/codecnegotiation/include/asterisk/options.h
team/oej/codecnegotiation/include/asterisk/pbx.h
team/oej/codecnegotiation/include/asterisk/strings.h
team/oej/codecnegotiation/include/asterisk/utils.h
team/oej/codecnegotiation/indications.c
team/oej/codecnegotiation/loader.c
team/oej/codecnegotiation/manager.c
team/oej/codecnegotiation/pbx.c
team/oej/codecnegotiation/pbx/Makefile
team/oej/codecnegotiation/pbx/pbx_ael.c
team/oej/codecnegotiation/pbx/pbx_dundi.c
team/oej/codecnegotiation/pbx/pbx_gtkconsole.c
team/oej/codecnegotiation/pbx/pbx_kdeconsole.cc
team/oej/codecnegotiation/redhat/asterisk.spec
team/oej/codecnegotiation/res/Makefile
team/oej/codecnegotiation/res/res_agi.c
team/oej/codecnegotiation/res/res_clioriginate.c
team/oej/codecnegotiation/res/res_config_odbc.c
team/oej/codecnegotiation/res/res_config_pgsql.c
team/oej/codecnegotiation/res/res_crypto.c
team/oej/codecnegotiation/res/res_features.c
team/oej/codecnegotiation/res/res_monitor.c
team/oej/codecnegotiation/res/res_musiconhold.c
team/oej/codecnegotiation/res/res_odbc.c
team/oej/codecnegotiation/res/res_osp.c
team/oej/codecnegotiation/res/res_snmp.c
team/oej/codecnegotiation/res/snmp/agent.c
team/oej/codecnegotiation/rtp.c
team/oej/codecnegotiation/say.c
team/oej/codecnegotiation/sched.c
team/oej/codecnegotiation/sounds.txt
team/oej/codecnegotiation/static-http/ajamdemo.html
team/oej/codecnegotiation/strcompat.c
team/oej/codecnegotiation/udptl.c
team/oej/codecnegotiation/utils/ (props changed)
team/oej/codecnegotiation/utils.c
team/oej/codecnegotiation/utils/Makefile
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 16 04:07:17 2006
@@ -14,3 +14,14 @@
tags
TAGS
testexpr2
+makeopts
+menuselect.makeopts
+config.status
+config.log
+makeopts.xml
+install-sh
+configure
+mkinstalldirs
+autom4te.cache
+missing
+aclocal.m4
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 16 04:07:17 2006
@@ -1,1 +1,1 @@
-/trunk:1-20949
+/trunk:1-25414
Modified: team/oej/codecnegotiation/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/CREDITS?rev=27300&r1=27299&r2=27300&view=diff
==============================================================================
--- team/oej/codecnegotiation/CREDITS (original)
+++ team/oej/codecnegotiation/CREDITS Tue May 16 04:07:17 2006
@@ -76,7 +76,7 @@
Steve Kann - new jitter buffer for IAX2
stevek at stevek.com
Constantine Filin - major contributions to the Asterisk Realtime Architecture
-Steve Murphy - privacy support
+Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade
Claude Patry - bug fixes, feature enhancements, and bug marshalling
cpatry at gmail.com
Modified: team/oej/codecnegotiation/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/Makefile?rev=27300&r1=27299&r2=27300&view=diff
==============================================================================
--- team/oej/codecnegotiation/Makefile (original)
+++ team/oej/codecnegotiation/Makefile Tue May 16 04:07:17 2006
@@ -49,7 +49,7 @@
# Remember the MAKELEVEL at the top
MAKETOPLEVEL?=$(MAKELEVEL)
-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
# More GSM codec optimization
# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
# which support MMX instructions. This should be newer pentiums,
@@ -96,13 +96,6 @@
# Uncomment next one to enable ast_frame tracing (for debugging)
TRACE_FRAMES = #-DTRACE_FRAMES
-
-# Uncomment next one to enable malloc debugging
-# You can view malloc debugging with:
-# *CLI> show memory allocations [filename]
-# *CLI> show memory summary [filename]
-#
-MALLOC_DEBUG = #-include $(PWD)/include/asterisk/astmm.h
# Where to install asterisk after compiling
# Default -> leave empty
@@ -182,32 +175,45 @@
ASTCFLAGS=
-# Define this to use files larger than 2GB (useful for sound files longer than 37 hours and logfiles)
-ASTCFLAGS+=-D_FILE_OFFSET_BITS=64
-
# Uncomment this to use the older DSP routines
#ASTCFLAGS+=-DOLD_DSP_ROUTINES
# If the file .asterisk.makeopts is present in your home directory, you can
-# include all of your favorite Makefile options so that every time you download
-# a new version of Asterisk, you don't have to edit the makefile to set them.
-# The file, /etc/asterisk.makeopts will also be included, but can be overridden
+# include all of your favorite menuselect options so that every time you download
+# a new version of Asterisk, you don't have to run menuselect to set them.
+# The file /etc/asterisk.makeopts will also be included but can be overridden
# by the file in your home directory.
-ifneq ($(wildcard /etc/asterisk.makeopts),)
- include /etc/asterisk.makeopts
-endif
-
-ifneq ($(wildcard ~/.asterisk.makeopts),)
- include ~/.asterisk.makeopts
-endif
+GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
+USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
+
+ifneq ($(wildcard menuselect.makeopts),)
+ include menuselect.makeopts
+endif
+
+ifneq ($(wildcard makeopts),)
+ include makeopts
+endif
+
+ASTCFLAGS+=$(MENUSELECT_CFLAGS)
+TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
+MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+
+# *CLI> show memory allocations [filename]
+# *CLI> show memory summary [filename]
+ifneq ($(findstring -DMALLOC_DEBUG,$(ASTCFLAGS)),)
+ TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
+ MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
+endif
+
+MOD_SUBDIR_CFLAGS+=-fPIC
ifeq ($(OSARCH),Linux)
ifeq ($(PROC),x86_64)
# You must have GCC 3.4 to use k8, otherwise use athlon
PROC=k8
#PROC=athlon
- OPTIONS+=-m64
endif
ifeq ($(PROC),sparc64)
@@ -228,9 +234,9 @@
OPTIONS+=-fsigned-char -mcpu=ep9312
else
ifeq ($(SUB_PROC),xscale)
- OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale
+ OPTIONS+=-fsigned-char -mcpu=xscale
else
- OPTIONS+=-fsigned-char -msoft-float
+ OPTIONS+=-fsigned-char
endif
endif
endif
@@ -246,10 +252,13 @@
ID=/usr/xpg4/bin/id
endif
-INCLUDE+=-Iinclude -I../include
-ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
+ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) #-DMAKE_VALGRIND_HAPPY
ASTCFLAGS+=$(OPTIMIZE)
-ASTCFLAGS+=# -Werror -Wunused
+
+ifeq ($(AST_DEVMODE),yes)
+ 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
@@ -265,14 +274,6 @@
ifeq ($(PROC),ppc)
ASTCFLAGS+=-fsigned-char
-endif
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp
-else
- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
- endif
endif
ifeq ($(OSARCH),FreeBSD)
@@ -300,27 +301,11 @@
INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
endif
-ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
- CYGLOADER=cygwin_a
- OSARCH=CYGWIN
- ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
- ASTLINK=
- LIBS+=-lpthread -lncurses -lm -lresolv
- ASTSBINDIR=$(MODULES_DIR)
-endif
-
-ifndef WITHOUT_ZAPTEL
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
- ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
-endif
-
-endif # WITHOUT_ZAPTEL
-
LIBEDIT=editline/libedit.a
+ASTERISKVERSION:=$(shell build_tools/make_version .)
+
ifneq ($(wildcard .version),)
- ASTERISKVERSION:=$(shell cat .version)
ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
else
@@ -332,11 +317,9 @@
# showing the branch they are made from
ifneq ($(wildcard .svnrevision),)
ASTERISKVERSIONNUM=999999
- ASTERISKVERSION:=SVN-$(shell cat .svnbranch)-r$(shell cat .svnrevision)
else
ifneq ($(wildcard .svn),)
ASTERISKVERSIONNUM=999999
- ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
endif
endif
@@ -345,11 +328,12 @@
ASTCFLAGS+= $(MALLOC_DEBUG)
ASTCFLAGS+= $(BUSYDETECT)
ASTCFLAGS+= $(OPTIONS)
-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
ASTCFLAGS+= -fomit-frame-pointer
endif
-SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
+MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
+SUBDIRS:=$(MOD_SUBDIRS) utils stdtime agi
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
translate.o file.o pbx.o cli.o md5.o term.o \
@@ -426,19 +410,17 @@
endif
ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
- CFLAGS+=$(ASTCFLAGS)
+ CFLAGS+=$(ASTCFLAGS) $(TOPDIR_CFLAGS)
endif
# This is used when generating the doxygen documentation
-ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),)
+ifneq ($(DOT),:)
HAVEDOT=yes
else
HAVEDOT=no
endif
INSTALL=install
-
-CFLAGS+=-DT38_SUPPORT
_all: all
@echo " +--------- Asterisk Build Complete ---------+"
@@ -446,10 +428,32 @@
@echo " + cannot be run before being installed by +"
@echo " + running: +"
@echo " + +"
- @echo " + $(MAKE) install +"
+ @echo " + make install +"
@echo " +-------------------------------------------+"
-all: cleantest depend asterisk subdirs
+all: include/autoconfig.h menuselect.makeopts cleantest depend asterisk subdirs
+
+configure:
+ - at ./bootstrap.sh
+
+include/autoconfig.h: configure
+ @CFLAGS="" ./configure
+ @echo "****"
+ @echo "**** The configure script was just executed, so 'make' needs to be"
+ @echo "**** restarted."
+ @echo "****"
+ @exit 1
+
+makeopts: configure
+ @CFLAGS="" ./configure
+ @echo "****"
+ @echo "**** The configure script was just executed, so 'make' needs to be"
+ @echo "**** restarted."
+ @echo "****"
+ @exit 1
+
+menuselect.makeopts: build_tools/menuselect makeopts.xml
+ @build_tools/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
#ifneq ($(wildcard tags),)
ctags: tags
@@ -459,16 +463,14 @@
all: TAGS
endif
-noclean: depend asterisk subdirs
-
editline/config.h:
- cd editline && unset CFLAGS LIBS && ./configure ; \
-
-editline/libedit.a: FORCE
- cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+ cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
+
+editline/libedit.a:
+ cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
$(MAKE) -C editline libedit.a
-db1-ast/libdb1.a: FORCE
+db1-ast/libdb1.a:
$(MAKE) -C db1-ast libdb1.a
ifneq ($(wildcard .depend),)
@@ -511,27 +513,24 @@
asterisk.txt: asterisk.sgml
docbook2txt asterisk.sgml
-defaults.h: FORCE
+defaults.h: makeopts
build_tools/make_defaults_h > $@.tmp
if cmp -s $@.tmp $@ ; then echo ; else \
mv $@.tmp $@ ; \
fi
rm -f $@.tmp
-include/asterisk/version.h: FORCE
+include/asterisk/version.h:
build_tools/make_version_h > $@.tmp
if cmp -s $@.tmp $@ ; then echo; else \
mv $@.tmp $@ ; \
fi
rm -f $@.tmp
-stdtime/libtime.a: FORCE
- $(MAKE) -C stdtime libtime.a
-
-cygwin_a:
- $(MAKE) -C cygwin all
-
-asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
+stdtime/libtime.a:
+ CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C stdtime libtime.a
+
+asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.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 \
mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
@@ -544,7 +543,9 @@
$(CC) $(AUDIO_LIBS) -o muted muted.o
subdirs:
- for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
+ for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
+ CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C utils
+ CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C agi
clean-depend:
for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
@@ -562,14 +563,23 @@
$(MAKE) -C db1-ast clean
$(MAKE) -C stdtime clean
+distclean: dist-clean
+
+dist-clean: clean
+ rm -f menuselect.makeopts makeopts makeopts.xml
+ rm -f config.log config.status
+ rm -f include/autoconfig.h
+ $(MAKE) -C mxml clean
+ $(MAKE) -C build_tools dist-clean
+
datafiles: all
if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
- # Should static HTTP be installed during make samples or even with its own target ala
- # webvoicemail? There are portions here that *could* be customized but might also be
- # improved a lot. I'll put it here for now.
+# Should static HTTP be installed during make samples or even with its own target ala
+# webvoicemail? There are portions here that *could* be customized but might also be
+# improved a lot. I'll put it here for now.
mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
for x in static-http/*; do \
- install -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
done
mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
@@ -664,7 +674,6 @@
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
@@ -673,7 +682,6 @@
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
fi
- for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
if [ -n "$(OLDHEADERS)" ]; then \
@@ -698,28 +706,9 @@
echo "You need to do cvs update -d not just cvs update" ; \
fi
if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
- @echo " +---- Asterisk Installation Complete -------+"
- @echo " + +"
- @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
- @echo " + +"
- @echo " + Asterisk has successfully been installed. +"
- @echo " + If you would like to install the sample +"
- @echo " + configuration files (overwriting any +"
- @echo " + existing config files), run: +"
- @echo " + +"
- @echo " + $(MAKE) samples +"
- @echo " + +"
- @echo " +----------------- or ---------------------+"
- @echo " + +"
- @echo " + You can go ahead and install the asterisk +"
- @echo " + program documentation now or later run: +"
- @echo " + +"
- @echo " + $(MAKE) progdocs +"
- @echo " + +"
- @echo " + **Note** This requires that you have +"
- @echo " + doxygen installed on your local system +"
- @echo " +-------------------------------------------+"
- @$(MAKE) -s oldmodcheck
+
+install-subdirs:
+ for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
NEWMODS=$(notdir $(wildcard */*.so))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -742,10 +731,32 @@
echo " WARNING WARNING WARNING" ;\
fi
-install: all datafiles bininstall
+install: all datafiles bininstall install-subdirs
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
+ @echo " +---- Asterisk Installation Complete -------+"
+ @echo " + +"
+ @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
+ @echo " + +"
+ @echo " + Asterisk has successfully been installed. +"
+ @echo " + If you would like to install the sample +"
+ @echo " + configuration files (overwriting any +"
+ @echo " + existing config files), run: +"
+ @echo " + +"
+ @echo " + $(MAKE) samples +"
+ @echo " + +"
+ @echo " +----------------- or ---------------------+"
+ @echo " + +"
+ @echo " + You can go ahead and install the asterisk +"
+ @echo " + program documentation now or later run: +"
+ @echo " + +"
+ @echo " + $(MAKE) progdocs +"
+ @echo " + +"
+ @echo " + **Note** This requires that you have +"
+ @echo " + doxygen installed on your local system +"
+ @echo " +-------------------------------------------+"
+ @$(MAKE) -s oldmodcheck
upgrade: all bininstall
@@ -873,21 +884,39 @@
$(MAKE) -C mpg123-0.59r $(MPG123TARG)
config:
- if [ -d /etc/rc.d/init.d ]; then \
- $(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
- /sbin/chkconfig --add asterisk; \
- elif [ -d /etc/init.d ]; then \
- $(INSTALL) -m 755 init.asterisk /etc/init.d/asterisk; \
- fi
-
-dont-optimize: install
+ @if [ "${OSARCH}" = "Linux" ]; then \
+ if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
+ $(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
+ /sbin/chkconfig --add asterisk; \
+ elif [ -f /etc/debian_version ]; then \
+ $(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk /etc/init.d/asterisk; \
+ /usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; \
+ elif [ -f /etc/gentoo-release ]; then \
+ $(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk /etc/init.d/asterisk; \
+ /sbin/rc-update add asterisk default; \
+ elif [ -f /etc/mandrake-release ]; then \
+ $(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk /etc/rc.d/init.d/asterisk; \
+ /sbin/chkconfig --add asterisk; \
+ elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
+ $(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk /etc/init.d/asterisk; \
+ /sbin/chkconfig --add asterisk; \
+ elif [ -f /etc/slackware-version ]; then \
+ echo "Slackware is not currently supported, although an init script does exist for it." \
+ else \
+ echo "We could not install init scripts for your distribution."; \
+ fi \
+ else \
+ echo "We could not install init scripts for your operating system."; \
+ fi
+
+dont-optimize: _all
valgrind: dont-optimize
depend: include/asterisk/version.h .depend defaults.h
for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
-.depend: include/asterisk/version.h
+.depend: include/asterisk/version.h defaults.h
build_tools/mkdep $(CFLAGS) $(wildcard *.c)
.tags-depend:
@@ -928,7 +957,6 @@
# If the cleancount has been changed, force a make clean.
# .cleancount is the global clean count, and .lastclean is the
# last clean count we had
-# We can avoid this by making noclean
cleantest:
if cmp -s .cleancount .lastclean ; then echo ; else \
@@ -967,3 +995,17 @@
rm -rf $(DESTDIR)$(ASTSPOOLDIR)
rm -rf $(DESTDIR)$(ASTETCDIR)
rm -rf $(DESTDIR)$(ASTLOGDIR)
+
+menuselect: build_tools/menuselect makeopts.xml
+ - at build_tools/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+
+build_tools/menuselect: build_tools/menuselect.c build_tools/menuselect_curses.c build_tools/menuselect.h include/autoconfig.h strcompat.o mxml/libmxml.a
+ $(MAKE) -C build_tools menuselect
+
+mxml/libmxml.a:
+ @cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
+ $(MAKE) -C mxml libmxml.a
+
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml
+ @echo "Generating list of available modules ..."
+ @build_tools/prep_moduledeps > $@
Modified: team/oej/codecnegotiation/README.codecnegotiation-branch
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/README.codecnegotiation-branch?rev=27300&r1=27299&r2=27300&view=diff
==============================================================================
--- team/oej/codecnegotiation/README.codecnegotiation-branch (original)
+++ team/oej/codecnegotiation/README.codecnegotiation-branch Tue May 16 04:07:17 2006
@@ -20,7 +20,10 @@
this variables, only through channel API.
After incorporating this to trunk, we could easily incorporate all patches like
-4824 (codec negotiation)
+4825 (codec negotiation rework).
+
+This patch DO NOT CHANGE any existing API's, only add some new functions, and
+convert most of code to using new API.
Changes description
-------------------
@@ -32,9 +35,21 @@
type;
- ast_get_read_format(chan) = chan->readformat
- ast_get_write_format(chan) = chan->writeformat
+ - ast_request_inherit -- wrapper around ast_request, that can:
+ - copy type from parent channel, if type not set;
+ - copy formats from parent channel;
+ - ast_chan_getformatname = ast_getformatname(chan->nativeformats)
Related changes:
- most places, where can be used new functions changed to use it
+
+Progress
+--------
+ - ast_chan_best_codec(chan) -- all modules fixed
+ - ast_get_(read|write)_format -- ~80% modules fixed (may be fixed after commit
+ as junitor project)
+ - ast_request_inherit -- all modules fixed (would be used for easily
+ integrate 4825 -- it contain many chunks with ast_request);
Contacts
--------
@@ -45,3 +60,4 @@
Discussions are best done on the asterisk-dev mailing list.
Bugs are reported to the bug tracker, issue #6725
+
Modified: team/oej/codecnegotiation/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/UPGRADE.txt?rev=27300&r1=27299&r2=27300&view=diff
==============================================================================
[... 28063 lines stripped ...]
More information about the asterisk-commits
mailing list