[asterisk-commits] branch oej/dialplan-ami-amievents r27387 - in /team/oej/dialplan-ami-amievent...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue May 16 09:01:53 MST 2006


Author: oej
Date: Tue May 16 11:01:50 2006
New Revision: 27387

URL: http://svn.digium.com/view/asterisk?rev=27387&view=rev
Log:
Update to trunk, reset automerge

Added:
    team/oej/dialplan-ami-amievents/acinclude.m4
      - copied unchanged from r27346, trunk/acinclude.m4
    team/oej/dialplan-ami-amievents/aclocal.m4
      - copied unchanged from r27346, trunk/aclocal.m4
    team/oej/dialplan-ami-amievents/apps/app_speech_utils.c
      - copied unchanged from r27346, trunk/apps/app_speech_utils.c
    team/oej/dialplan-ami-amievents/bootstrap.sh
      - copied unchanged from r27346, trunk/bootstrap.sh
    team/oej/dialplan-ami-amievents/build_tools/Makefile
      - copied unchanged from r27346, trunk/build_tools/Makefile
    team/oej/dialplan-ami-amievents/build_tools/cflags.xml
      - copied unchanged from r27346, trunk/build_tools/cflags.xml
    team/oej/dialplan-ami-amievents/build_tools/get_moduledeps
      - copied unchanged from r27346, trunk/build_tools/get_moduledeps
    team/oej/dialplan-ami-amievents/build_tools/make_buildopts_h
      - copied unchanged from r27346, trunk/build_tools/make_buildopts_h
    team/oej/dialplan-ami-amievents/build_tools/make_version
      - copied unchanged from r27346, trunk/build_tools/make_version
    team/oej/dialplan-ami-amievents/build_tools/menuselect-deps.in
      - copied unchanged from r27346, trunk/build_tools/menuselect-deps.in
    team/oej/dialplan-ami-amievents/build_tools/menuselect.c
      - copied unchanged from r27346, trunk/build_tools/menuselect.c
    team/oej/dialplan-ami-amievents/build_tools/menuselect.h
      - copied unchanged from r27346, trunk/build_tools/menuselect.h
    team/oej/dialplan-ami-amievents/build_tools/menuselect_curses.c
      - copied unchanged from r27346, trunk/build_tools/menuselect_curses.c
    team/oej/dialplan-ami-amievents/build_tools/prep_moduledeps
      - copied unchanged from r27346, trunk/build_tools/prep_moduledeps
    team/oej/dialplan-ami-amievents/config.guess
      - copied unchanged from r27346, trunk/config.guess
    team/oej/dialplan-ami-amievents/config.sub
      - copied unchanged from r27346, trunk/config.sub
    team/oej/dialplan-ami-amievents/configs/say.conf.sample
      - copied unchanged from r27346, trunk/configs/say.conf.sample
    team/oej/dialplan-ami-amievents/configure
      - copied unchanged from r27346, trunk/configure
    team/oej/dialplan-ami-amievents/configure.ac
      - copied unchanged from r27346, trunk/configure.ac
    team/oej/dialplan-ami-amievents/doc/ajam.txt
      - copied unchanged from r27346, trunk/doc/ajam.txt
    team/oej/dialplan-ami-amievents/doc/datastores.txt
      - copied unchanged from r27346, trunk/doc/datastores.txt
    team/oej/dialplan-ami-amievents/doc/speechrec.txt
      - copied unchanged from r27346, trunk/doc/speechrec.txt
    team/oej/dialplan-ami-amievents/funcs/func_realtime.c
      - copied unchanged from r27346, trunk/funcs/func_realtime.c
    team/oej/dialplan-ami-amievents/include/asterisk/ael_structs.h
      - copied unchanged from r27346, trunk/include/asterisk/ael_structs.h
    team/oej/dialplan-ami-amievents/include/asterisk/speech.h
      - copied unchanged from r27346, trunk/include/asterisk/speech.h
    team/oej/dialplan-ami-amievents/include/autoconfig.h.in
      - copied unchanged from r27346, trunk/include/autoconfig.h.in
    team/oej/dialplan-ami-amievents/install-sh
      - copied unchanged from r27346, trunk/install-sh
    team/oej/dialplan-ami-amievents/makeopts.in
      - copied unchanged from r27346, trunk/makeopts.in
    team/oej/dialplan-ami-amievents/missing
      - copied unchanged from r27346, trunk/missing
    team/oej/dialplan-ami-amievents/mkinstalldirs
      - copied unchanged from r27346, trunk/mkinstalldirs
    team/oej/dialplan-ami-amievents/mxml/   (props changed)
      - copied from r27346, trunk/mxml/
    team/oej/dialplan-ami-amievents/mxml/ANNOUNCEMENT
      - copied unchanged from r27346, trunk/mxml/ANNOUNCEMENT
    team/oej/dialplan-ami-amievents/mxml/CHANGES
      - copied unchanged from r27346, trunk/mxml/CHANGES
    team/oej/dialplan-ami-amievents/mxml/COPYING
      - copied unchanged from r27346, trunk/mxml/COPYING
    team/oej/dialplan-ami-amievents/mxml/Makefile.in
      - copied unchanged from r27346, trunk/mxml/Makefile.in
    team/oej/dialplan-ami-amievents/mxml/README
      - copied unchanged from r27346, trunk/mxml/README
    team/oej/dialplan-ami-amievents/mxml/config.h.in
      - copied unchanged from r27346, trunk/mxml/config.h.in
    team/oej/dialplan-ami-amievents/mxml/configure
      - copied unchanged from r27346, trunk/mxml/configure
    team/oej/dialplan-ami-amievents/mxml/install-sh
      - copied unchanged from r27346, trunk/mxml/install-sh
    team/oej/dialplan-ami-amievents/mxml/mxml-attr.c
      - copied unchanged from r27346, trunk/mxml/mxml-attr.c
    team/oej/dialplan-ami-amievents/mxml/mxml-entity.c
      - copied unchanged from r27346, trunk/mxml/mxml-entity.c
    team/oej/dialplan-ami-amievents/mxml/mxml-file.c
      - copied unchanged from r27346, trunk/mxml/mxml-file.c
    team/oej/dialplan-ami-amievents/mxml/mxml-index.c
      - copied unchanged from r27346, trunk/mxml/mxml-index.c
    team/oej/dialplan-ami-amievents/mxml/mxml-node.c
      - copied unchanged from r27346, trunk/mxml/mxml-node.c
    team/oej/dialplan-ami-amievents/mxml/mxml-private.c
      - copied unchanged from r27346, trunk/mxml/mxml-private.c
    team/oej/dialplan-ami-amievents/mxml/mxml-search.c
      - copied unchanged from r27346, trunk/mxml/mxml-search.c
    team/oej/dialplan-ami-amievents/mxml/mxml-set.c
      - copied unchanged from r27346, trunk/mxml/mxml-set.c
    team/oej/dialplan-ami-amievents/mxml/mxml-string.c
      - copied unchanged from r27346, trunk/mxml/mxml-string.c
    team/oej/dialplan-ami-amievents/mxml/mxml.h
      - copied unchanged from r27346, trunk/mxml/mxml.h
    team/oej/dialplan-ami-amievents/mxml/mxml.list.in
      - copied unchanged from r27346, trunk/mxml/mxml.list.in
    team/oej/dialplan-ami-amievents/mxml/mxml.pc
      - copied unchanged from r27346, trunk/mxml/mxml.pc
    team/oej/dialplan-ami-amievents/mxml/mxml.pc.in
      - copied unchanged from r27346, trunk/mxml/mxml.pc.in
    team/oej/dialplan-ami-amievents/pbx/ael/   (props changed)
      - copied from r27346, trunk/pbx/ael/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/
      - copied from r27346, trunk/pbx/ael/ael-test/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test1/
      - copied from r27346, trunk/pbx/ael/ael-test/ael-test1/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test1/extensions.ael
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test1/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test2/
      - copied from r27346, trunk/pbx/ael/ael-test/ael-test2/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test2/apptest.ael2
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test2/apptest.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test2/extensions.ael
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test2/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test3/
      - copied from r27346, trunk/pbx/ael/ael-test/ael-test3/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test3/extensions.ael
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test3/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test3/include1.ael2
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test3/include1.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test3/include2.ael2
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test3/include2.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test3/include3.ael2
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test3/include3.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test3/include4.ael2
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test3/include4.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test3/include5.ael2
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test3/include5.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test4/
      - copied from r27346, trunk/pbx/ael/ael-test/ael-test4/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test4/apptest.ael2
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test4/apptest.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test4/extensions.ael
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test4/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test5/
      - copied from r27346, trunk/pbx/ael/ael-test/ael-test5/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test5/extensions.ael
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test5/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test6/
      - copied from r27346, trunk/pbx/ael/ael-test/ael-test6/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test6/extensions.ael
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test6/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test7/
      - copied from r27346, trunk/pbx/ael/ael-test/ael-test7/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test7/extensions.ael
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ael-test7/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test1
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ref.ael-test1
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test2
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ref.ael-test2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test3
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ref.ael-test3
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test4
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ref.ael-test4
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test5
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ref.ael-test5
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test6
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ref.ael-test6
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test7
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/ref.ael-test7
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/runtests
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/runtests
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/setref
      - copied unchanged from r27346, trunk/pbx/ael/ael-test/setref
    team/oej/dialplan-ami-amievents/pbx/ael/ael.flex
      - copied unchanged from r27346, trunk/pbx/ael/ael.flex
    team/oej/dialplan-ami-amievents/pbx/ael/ael.tab.c
      - copied unchanged from r27346, trunk/pbx/ael/ael.tab.c
    team/oej/dialplan-ami-amievents/pbx/ael/ael.tab.h
      - copied unchanged from r27346, trunk/pbx/ael/ael.tab.h
    team/oej/dialplan-ami-amievents/pbx/ael/ael.y
      - copied unchanged from r27346, trunk/pbx/ael/ael.y
    team/oej/dialplan-ami-amievents/pbx/ael/ael_lex.c
      - copied unchanged from r27346, trunk/pbx/ael/ael_lex.c
    team/oej/dialplan-ami-amievents/res/res_config_pgsql.c
      - copied unchanged from r27346, trunk/res/res_config_pgsql.c
    team/oej/dialplan-ami-amievents/res/res_speech.c
      - copied unchanged from r27346, trunk/res/res_speech.c
    team/oej/dialplan-ami-amievents/sounds/vm-tempgreetactive.gsm
      - copied unchanged from r27346, trunk/sounds/vm-tempgreetactive.gsm
    team/oej/dialplan-ami-amievents/static-http/
      - copied from r27346, trunk/static-http/
    team/oej/dialplan-ami-amievents/static-http/ajamdemo.html
      - copied unchanged from r27346, trunk/static-http/ajamdemo.html
    team/oej/dialplan-ami-amievents/static-http/astman.css
      - copied unchanged from r27346, trunk/static-http/astman.css
    team/oej/dialplan-ami-amievents/static-http/astman.js
      - copied unchanged from r27346, trunk/static-http/astman.js
    team/oej/dialplan-ami-amievents/static-http/prototype.js
      - copied unchanged from r27346, trunk/static-http/prototype.js
    team/oej/dialplan-ami-amievents/utils/ael_main.c
      - copied unchanged from r27346, trunk/utils/ael_main.c
    team/oej/dialplan-ami-amievents/utils/expr2.testinput
      - copied unchanged from r27346, trunk/utils/expr2.testinput
Removed:
    team/oej/dialplan-ami-amievents/build_tools/make_svn_branch_name
    team/oej/dialplan-ami-amievents/formats/format_au.c
    team/oej/dialplan-ami-amievents/formats/format_pcm_alaw.c
Modified:
    team/oej/dialplan-ami-amievents/   (props changed)
    team/oej/dialplan-ami-amievents/.cleancount
    team/oej/dialplan-ami-amievents/CREDITS
    team/oej/dialplan-ami-amievents/Makefile
    team/oej/dialplan-ami-amievents/README
    team/oej/dialplan-ami-amievents/UPGRADE.txt
    team/oej/dialplan-ami-amievents/acl.c
    team/oej/dialplan-ami-amievents/agi/Makefile
    team/oej/dialplan-ami-amievents/agi/eagi-sphinx-test.c
    team/oej/dialplan-ami-amievents/agi/eagi-test.c
    team/oej/dialplan-ami-amievents/app.c
    team/oej/dialplan-ami-amievents/apps/Makefile
    team/oej/dialplan-ami-amievents/apps/app_adsiprog.c
    team/oej/dialplan-ami-amievents/apps/app_alarmreceiver.c
    team/oej/dialplan-ami-amievents/apps/app_amd.c
    team/oej/dialplan-ami-amievents/apps/app_authenticate.c
    team/oej/dialplan-ami-amievents/apps/app_cdr.c
    team/oej/dialplan-ami-amievents/apps/app_chanisavail.c
    team/oej/dialplan-ami-amievents/apps/app_channelredirect.c
    team/oej/dialplan-ami-amievents/apps/app_chanspy.c
    team/oej/dialplan-ami-amievents/apps/app_controlplayback.c
    team/oej/dialplan-ami-amievents/apps/app_db.c
    team/oej/dialplan-ami-amievents/apps/app_dial.c
    team/oej/dialplan-ami-amievents/apps/app_dictate.c
    team/oej/dialplan-ami-amievents/apps/app_directed_pickup.c
    team/oej/dialplan-ami-amievents/apps/app_directory.c
    team/oej/dialplan-ami-amievents/apps/app_disa.c
    team/oej/dialplan-ami-amievents/apps/app_dumpchan.c
    team/oej/dialplan-ami-amievents/apps/app_echo.c
    team/oej/dialplan-ami-amievents/apps/app_exec.c
    team/oej/dialplan-ami-amievents/apps/app_externalivr.c
    team/oej/dialplan-ami-amievents/apps/app_festival.c
    team/oej/dialplan-ami-amievents/apps/app_flash.c
    team/oej/dialplan-ami-amievents/apps/app_forkcdr.c
    team/oej/dialplan-ami-amievents/apps/app_getcpeid.c
    team/oej/dialplan-ami-amievents/apps/app_hasnewvoicemail.c
    team/oej/dialplan-ami-amievents/apps/app_ices.c
    team/oej/dialplan-ami-amievents/apps/app_image.c
    team/oej/dialplan-ami-amievents/apps/app_ivrdemo.c
    team/oej/dialplan-ami-amievents/apps/app_lookupblacklist.c
    team/oej/dialplan-ami-amievents/apps/app_lookupcidname.c
    team/oej/dialplan-ami-amievents/apps/app_macro.c
    team/oej/dialplan-ami-amievents/apps/app_meetme.c
    team/oej/dialplan-ami-amievents/apps/app_milliwatt.c
    team/oej/dialplan-ami-amievents/apps/app_mixmonitor.c
    team/oej/dialplan-ami-amievents/apps/app_morsecode.c
    team/oej/dialplan-ami-amievents/apps/app_mp3.c
    team/oej/dialplan-ami-amievents/apps/app_nbscat.c
    team/oej/dialplan-ami-amievents/apps/app_osplookup.c
    team/oej/dialplan-ami-amievents/apps/app_page.c
    team/oej/dialplan-ami-amievents/apps/app_parkandannounce.c
    team/oej/dialplan-ami-amievents/apps/app_playback.c
    team/oej/dialplan-ami-amievents/apps/app_privacy.c
    team/oej/dialplan-ami-amievents/apps/app_queue.c
    team/oej/dialplan-ami-amievents/apps/app_random.c
    team/oej/dialplan-ami-amievents/apps/app_read.c
    team/oej/dialplan-ami-amievents/apps/app_readfile.c
    team/oej/dialplan-ami-amievents/apps/app_realtime.c
    team/oej/dialplan-ami-amievents/apps/app_record.c
    team/oej/dialplan-ami-amievents/apps/app_rpt.c
    team/oej/dialplan-ami-amievents/apps/app_sayunixtime.c
    team/oej/dialplan-ami-amievents/apps/app_senddtmf.c
    team/oej/dialplan-ami-amievents/apps/app_sendtext.c
    team/oej/dialplan-ami-amievents/apps/app_setcallerid.c
    team/oej/dialplan-ami-amievents/apps/app_setcdruserfield.c
    team/oej/dialplan-ami-amievents/apps/app_settransfercapability.c
    team/oej/dialplan-ami-amievents/apps/app_skel.c
    team/oej/dialplan-ami-amievents/apps/app_sms.c
    team/oej/dialplan-ami-amievents/apps/app_softhangup.c
    team/oej/dialplan-ami-amievents/apps/app_stack.c
    team/oej/dialplan-ami-amievents/apps/app_system.c
    team/oej/dialplan-ami-amievents/apps/app_talkdetect.c
    team/oej/dialplan-ami-amievents/apps/app_test.c
    team/oej/dialplan-ami-amievents/apps/app_transfer.c
    team/oej/dialplan-ami-amievents/apps/app_url.c
    team/oej/dialplan-ami-amievents/apps/app_userevent.c
    team/oej/dialplan-ami-amievents/apps/app_verbose.c
    team/oej/dialplan-ami-amievents/apps/app_voicemail.c
    team/oej/dialplan-ami-amievents/apps/app_waitforring.c
    team/oej/dialplan-ami-amievents/apps/app_waitforsilence.c
    team/oej/dialplan-ami-amievents/apps/app_while.c
    team/oej/dialplan-ami-amievents/apps/app_zapateller.c
    team/oej/dialplan-ami-amievents/apps/app_zapbarge.c
    team/oej/dialplan-ami-amievents/apps/app_zapras.c
    team/oej/dialplan-ami-amievents/apps/app_zapscan.c
    team/oej/dialplan-ami-amievents/ast_expr2.c
    team/oej/dialplan-ami-amievents/ast_expr2.fl
    team/oej/dialplan-ami-amievents/ast_expr2.h
    team/oej/dialplan-ami-amievents/ast_expr2.y
    team/oej/dialplan-ami-amievents/ast_expr2f.c
    team/oej/dialplan-ami-amievents/asterisk.8
    team/oej/dialplan-ami-amievents/asterisk.c
    team/oej/dialplan-ami-amievents/asterisk.sgml
    team/oej/dialplan-ami-amievents/build_tools/   (props changed)
    team/oej/dialplan-ami-amievents/build_tools/make_defaults_h
    team/oej/dialplan-ami-amievents/callerid.c
    team/oej/dialplan-ami-amievents/cdr.c
    team/oej/dialplan-ami-amievents/cdr/Makefile
    team/oej/dialplan-ami-amievents/cdr/cdr_csv.c
    team/oej/dialplan-ami-amievents/cdr/cdr_custom.c
    team/oej/dialplan-ami-amievents/cdr/cdr_manager.c
    team/oej/dialplan-ami-amievents/cdr/cdr_odbc.c
    team/oej/dialplan-ami-amievents/cdr/cdr_pgsql.c
    team/oej/dialplan-ami-amievents/cdr/cdr_sqlite.c
    team/oej/dialplan-ami-amievents/cdr/cdr_tds.c
    team/oej/dialplan-ami-amievents/channel.c
    team/oej/dialplan-ami-amievents/channels/Makefile
    team/oej/dialplan-ami-amievents/channels/chan_agent.c
    team/oej/dialplan-ami-amievents/channels/chan_alsa.c
    team/oej/dialplan-ami-amievents/channels/chan_features.c
    team/oej/dialplan-ami-amievents/channels/chan_h323.c
    team/oej/dialplan-ami-amievents/channels/chan_iax2.c
    team/oej/dialplan-ami-amievents/channels/chan_local.c
    team/oej/dialplan-ami-amievents/channels/chan_mgcp.c
    team/oej/dialplan-ami-amievents/channels/chan_misdn.c
    team/oej/dialplan-ami-amievents/channels/chan_nbs.c
    team/oej/dialplan-ami-amievents/channels/chan_oss.c
    team/oej/dialplan-ami-amievents/channels/chan_phone.c
    team/oej/dialplan-ami-amievents/channels/chan_sip.c
    team/oej/dialplan-ami-amievents/channels/chan_skinny.c
    team/oej/dialplan-ami-amievents/channels/chan_vpb.c
    team/oej/dialplan-ami-amievents/channels/chan_zap.c
    team/oej/dialplan-ami-amievents/channels/h323/Makefile
    team/oej/dialplan-ami-amievents/channels/h323/ast_h323.cpp
    team/oej/dialplan-ami-amievents/channels/iax2-provision.h
    team/oej/dialplan-ami-amievents/channels/iax2.h
    team/oej/dialplan-ami-amievents/channels/misdn/Makefile
    team/oej/dialplan-ami-amievents/channels/misdn/chan_misdn_config.h
    team/oej/dialplan-ami-amievents/channels/misdn/isdn_lib.c
    team/oej/dialplan-ami-amievents/channels/misdn/isdn_lib.h
    team/oej/dialplan-ami-amievents/channels/misdn/isdn_lib_intern.h
    team/oej/dialplan-ami-amievents/channels/misdn/isdn_msg_parser.c
    team/oej/dialplan-ami-amievents/channels/misdn/portinfo.c
    team/oej/dialplan-ami-amievents/channels/misdn_config.c
    team/oej/dialplan-ami-amievents/cli.c
    team/oej/dialplan-ami-amievents/codecs/Makefile
    team/oej/dialplan-ami-amievents/codecs/codec_a_mu.c
    team/oej/dialplan-ami-amievents/codecs/codec_adpcm.c
    team/oej/dialplan-ami-amievents/codecs/codec_alaw.c
    team/oej/dialplan-ami-amievents/codecs/codec_g723_1.c
    team/oej/dialplan-ami-amievents/codecs/codec_g726.c
    team/oej/dialplan-ami-amievents/codecs/codec_gsm.c
    team/oej/dialplan-ami-amievents/codecs/codec_ilbc.c
    team/oej/dialplan-ami-amievents/codecs/codec_lpc10.c
    team/oej/dialplan-ami-amievents/codecs/codec_speex.c
    team/oej/dialplan-ami-amievents/codecs/codec_ulaw.c
    team/oej/dialplan-ami-amievents/codecs/gsm/Makefile
    team/oej/dialplan-ami-amievents/codecs/ilbc/Makefile
    team/oej/dialplan-ami-amievents/codecs/lpc10/Makefile
    team/oej/dialplan-ami-amievents/config.c
    team/oej/dialplan-ami-amievents/configs/agents.conf.sample
    team/oej/dialplan-ami-amievents/configs/extensions.ael.sample
    team/oej/dialplan-ami-amievents/configs/extensions.conf.sample
    team/oej/dialplan-ami-amievents/configs/features.conf.sample
    team/oej/dialplan-ami-amievents/configs/func_odbc.conf.sample
    team/oej/dialplan-ami-amievents/configs/http.conf.sample
    team/oej/dialplan-ami-amievents/configs/iax.conf.sample
    team/oej/dialplan-ami-amievents/configs/indications.conf.sample
    team/oej/dialplan-ami-amievents/configs/manager.conf.sample
    team/oej/dialplan-ami-amievents/configs/meetme.conf.sample
    team/oej/dialplan-ami-amievents/configs/mgcp.conf.sample
    team/oej/dialplan-ami-amievents/configs/misdn.conf.sample
    team/oej/dialplan-ami-amievents/configs/modules.conf.sample
    team/oej/dialplan-ami-amievents/configs/osp.conf.sample
    team/oej/dialplan-ami-amievents/configs/queues.conf.sample
    team/oej/dialplan-ami-amievents/configs/sip.conf.sample
    team/oej/dialplan-ami-amievents/configs/skinny.conf.sample
    team/oej/dialplan-ami-amievents/configs/voicemail.conf.sample
    team/oej/dialplan-ami-amievents/configs/zapata.conf.sample
    team/oej/dialplan-ami-amievents/contrib/scripts/safe_asterisk
    team/oej/dialplan-ami-amievents/contrib/scripts/safe_asterisk.8
    team/oej/dialplan-ami-amievents/cryptostub.c
    team/oej/dialplan-ami-amievents/db1-ast/Makefile
    team/oej/dialplan-ami-amievents/db1-ast/hash/hash.c
    team/oej/dialplan-ami-amievents/devicestate.c
    team/oej/dialplan-ami-amievents/dns.c
    team/oej/dialplan-ami-amievents/dnsmgr.c
    team/oej/dialplan-ami-amievents/doc/00README.1st
    team/oej/dialplan-ami-amievents/doc/CODING-GUIDELINES
    team/oej/dialplan-ami-amievents/doc/ael.txt
    team/oej/dialplan-ami-amievents/doc/asterisk-conf.txt
    team/oej/dialplan-ami-amievents/doc/channelvariables.txt
    team/oej/dialplan-ami-amievents/doc/cliprompt.txt
    team/oej/dialplan-ami-amievents/doc/iax.txt
    team/oej/dialplan-ami-amievents/doc/manager.txt
    team/oej/dialplan-ami-amievents/doc/queuelog.txt
    team/oej/dialplan-ami-amievents/doc/smdi.txt
    team/oej/dialplan-ami-amievents/dsp.c
    team/oej/dialplan-ami-amievents/editline/configure
    team/oej/dialplan-ami-amievents/editline/makelist
    team/oej/dialplan-ami-amievents/enum.c
    team/oej/dialplan-ami-amievents/file.c
    team/oej/dialplan-ami-amievents/formats/Makefile
    team/oej/dialplan-ami-amievents/formats/format_g723.c
    team/oej/dialplan-ami-amievents/formats/format_g726.c
    team/oej/dialplan-ami-amievents/formats/format_g729.c
    team/oej/dialplan-ami-amievents/formats/format_gsm.c
    team/oej/dialplan-ami-amievents/formats/format_h263.c
    team/oej/dialplan-ami-amievents/formats/format_h264.c
    team/oej/dialplan-ami-amievents/formats/format_ilbc.c
    team/oej/dialplan-ami-amievents/formats/format_jpeg.c
    team/oej/dialplan-ami-amievents/formats/format_ogg_vorbis.c
    team/oej/dialplan-ami-amievents/formats/format_pcm.c
    team/oej/dialplan-ami-amievents/formats/format_sln.c
    team/oej/dialplan-ami-amievents/formats/format_vox.c
    team/oej/dialplan-ami-amievents/formats/format_wav.c
    team/oej/dialplan-ami-amievents/formats/format_wav_gsm.c
    team/oej/dialplan-ami-amievents/frame.c
    team/oej/dialplan-ami-amievents/funcs/Makefile
    team/oej/dialplan-ami-amievents/funcs/func_base64.c
    team/oej/dialplan-ami-amievents/funcs/func_callerid.c
    team/oej/dialplan-ami-amievents/funcs/func_cdr.c
    team/oej/dialplan-ami-amievents/funcs/func_channel.c
    team/oej/dialplan-ami-amievents/funcs/func_curl.c
    team/oej/dialplan-ami-amievents/funcs/func_cut.c
    team/oej/dialplan-ami-amievents/funcs/func_db.c
    team/oej/dialplan-ami-amievents/funcs/func_enum.c
    team/oej/dialplan-ami-amievents/funcs/func_env.c
    team/oej/dialplan-ami-amievents/funcs/func_groupcount.c
    team/oej/dialplan-ami-amievents/funcs/func_language.c
    team/oej/dialplan-ami-amievents/funcs/func_logic.c
    team/oej/dialplan-ami-amievents/funcs/func_math.c
    team/oej/dialplan-ami-amievents/funcs/func_md5.c
    team/oej/dialplan-ami-amievents/funcs/func_moh.c
    team/oej/dialplan-ami-amievents/funcs/func_odbc.c
    team/oej/dialplan-ami-amievents/funcs/func_rand.c
    team/oej/dialplan-ami-amievents/funcs/func_sha1.c
    team/oej/dialplan-ami-amievents/funcs/func_strings.c
    team/oej/dialplan-ami-amievents/funcs/func_timeout.c
    team/oej/dialplan-ami-amievents/funcs/func_uri.c
    team/oej/dialplan-ami-amievents/http.c
    team/oej/dialplan-ami-amievents/image.c
    team/oej/dialplan-ami-amievents/include/   (props changed)
    team/oej/dialplan-ami-amievents/include/asterisk/   (props changed)
    team/oej/dialplan-ami-amievents/include/asterisk.h
    team/oej/dialplan-ami-amievents/include/asterisk/adsi.h
    team/oej/dialplan-ami-amievents/include/asterisk/app.h
    team/oej/dialplan-ami-amievents/include/asterisk/astmm.h
    team/oej/dialplan-ami-amievents/include/asterisk/astosp.h
    team/oej/dialplan-ami-amievents/include/asterisk/callerid.h
    team/oej/dialplan-ami-amievents/include/asterisk/cdr.h
    team/oej/dialplan-ami-amievents/include/asterisk/channel.h
    team/oej/dialplan-ami-amievents/include/asterisk/cli.h
    team/oej/dialplan-ami-amievents/include/asterisk/compat.h
    team/oej/dialplan-ami-amievents/include/asterisk/crypto.h
    team/oej/dialplan-ami-amievents/include/asterisk/devicestate.h
    team/oej/dialplan-ami-amievents/include/asterisk/dns.h
    team/oej/dialplan-ami-amievents/include/asterisk/doxyref.h
    team/oej/dialplan-ami-amievents/include/asterisk/enum.h
    team/oej/dialplan-ami-amievents/include/asterisk/features.h
    team/oej/dialplan-ami-amievents/include/asterisk/file.h
    team/oej/dialplan-ami-amievents/include/asterisk/frame.h
    team/oej/dialplan-ami-amievents/include/asterisk/fskmodem.h
    team/oej/dialplan-ami-amievents/include/asterisk/http.h
    team/oej/dialplan-ami-amievents/include/asterisk/image.h
    team/oej/dialplan-ami-amievents/include/asterisk/indications.h
    team/oej/dialplan-ami-amievents/include/asterisk/io.h
    team/oej/dialplan-ami-amievents/include/asterisk/linkedlists.h
    team/oej/dialplan-ami-amievents/include/asterisk/localtime.h
    team/oej/dialplan-ami-amievents/include/asterisk/lock.h
    team/oej/dialplan-ami-amievents/include/asterisk/logger.h
    team/oej/dialplan-ami-amievents/include/asterisk/manager.h
    team/oej/dialplan-ami-amievents/include/asterisk/module.h
    team/oej/dialplan-ami-amievents/include/asterisk/musiconhold.h
    team/oej/dialplan-ami-amievents/include/asterisk/options.h
    team/oej/dialplan-ami-amievents/include/asterisk/pbx.h
    team/oej/dialplan-ami-amievents/include/asterisk/res_odbc.h
    team/oej/dialplan-ami-amievents/include/asterisk/rtp.h
    team/oej/dialplan-ami-amievents/include/asterisk/say.h
    team/oej/dialplan-ami-amievents/include/asterisk/sched.h
    team/oej/dialplan-ami-amievents/include/asterisk/strings.h
    team/oej/dialplan-ami-amievents/include/asterisk/tdd.h
    team/oej/dialplan-ami-amievents/include/asterisk/term.h
    team/oej/dialplan-ami-amievents/include/asterisk/translate.h
    team/oej/dialplan-ami-amievents/include/asterisk/utils.h
    team/oej/dialplan-ami-amievents/indications.c
    team/oej/dialplan-ami-amievents/loader.c
    team/oej/dialplan-ami-amievents/logger.c
    team/oej/dialplan-ami-amievents/manager.c
    team/oej/dialplan-ami-amievents/netsock.c
    team/oej/dialplan-ami-amievents/pbx.c
    team/oej/dialplan-ami-amievents/pbx/Makefile
    team/oej/dialplan-ami-amievents/pbx/pbx_ael.c
    team/oej/dialplan-ami-amievents/pbx/pbx_config.c
    team/oej/dialplan-ami-amievents/pbx/pbx_dundi.c
    team/oej/dialplan-ami-amievents/pbx/pbx_gtkconsole.c
    team/oej/dialplan-ami-amievents/pbx/pbx_kdeconsole.cc
    team/oej/dialplan-ami-amievents/pbx/pbx_loopback.c
    team/oej/dialplan-ami-amievents/pbx/pbx_realtime.c
    team/oej/dialplan-ami-amievents/pbx/pbx_spool.c
    team/oej/dialplan-ami-amievents/redhat/asterisk.spec
    team/oej/dialplan-ami-amievents/res/Makefile
    team/oej/dialplan-ami-amievents/res/res_adsi.c
    team/oej/dialplan-ami-amievents/res/res_agi.c
    team/oej/dialplan-ami-amievents/res/res_clioriginate.c
    team/oej/dialplan-ami-amievents/res/res_config_odbc.c
    team/oej/dialplan-ami-amievents/res/res_convert.c
    team/oej/dialplan-ami-amievents/res/res_crypto.c
    team/oej/dialplan-ami-amievents/res/res_features.c
    team/oej/dialplan-ami-amievents/res/res_indications.c
    team/oej/dialplan-ami-amievents/res/res_monitor.c
    team/oej/dialplan-ami-amievents/res/res_musiconhold.c
    team/oej/dialplan-ami-amievents/res/res_odbc.c
    team/oej/dialplan-ami-amievents/res/res_osp.c
    team/oej/dialplan-ami-amievents/res/res_smdi.c
    team/oej/dialplan-ami-amievents/res/res_snmp.c
    team/oej/dialplan-ami-amievents/res/snmp/agent.c
    team/oej/dialplan-ami-amievents/rtp.c
    team/oej/dialplan-ami-amievents/say.c
    team/oej/dialplan-ami-amievents/sched.c
    team/oej/dialplan-ami-amievents/sounds.txt
    team/oej/dialplan-ami-amievents/strcompat.c
    team/oej/dialplan-ami-amievents/translate.c
    team/oej/dialplan-ami-amievents/udptl.c
    team/oej/dialplan-ami-amievents/utils/   (props changed)
    team/oej/dialplan-ami-amievents/utils.c
    team/oej/dialplan-ami-amievents/utils/Makefile
    team/oej/dialplan-ami-amievents/utils/astman.c

Propchange: team/oej/dialplan-ami-amievents/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

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

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

Propchange: team/oej/dialplan-ami-amievents/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 16 11:01:50 2006
@@ -14,3 +14,9 @@
 tags
 TAGS
 testexpr2
+makeopts
+menuselect.makeopts
+config.status
+config.log
+makeopts.xml
+autom4te.cache

Propchange: team/oej/dialplan-ami-amievents/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 16 11:01:50 2006
@@ -1,1 +1,1 @@
-/trunk:1-16441
+/trunk:1-27367

Modified: team/oej/dialplan-ami-amievents/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/.cleancount?rev=27387&r1=27386&r2=27387&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/.cleancount (original)
+++ team/oej/dialplan-ami-amievents/.cleancount Tue May 16 11:01:50 2006
@@ -1,1 +1,1 @@
-12
+16

Modified: team/oej/dialplan-ami-amievents/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/CREDITS?rev=27387&r1=27386&r2=27387&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/CREDITS (original)
+++ team/oej/dialplan-ami-amievents/CREDITS Tue May 16 11:01:50 2006
@@ -12,6 +12,8 @@
 Telesthetic - for supporting SIP development
 
 Christos Ricudis - for substantial code contributions
+
+nic.at - ENUM support in Asterisk
 
 Paul Bagyenda, Digital Solutions - for initial Voicetronix driver development
 
@@ -74,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
 
@@ -90,6 +92,11 @@
 Music provided by www.freeplaymusic.com
 
 === OTHER SOURCE CODE IN ASTERISK ===
+Asterisk uses libedit, the lightweight readline replacement from
+NetBSD. It is BSD-licensed and requires the following statement:
+
+      This product includes software developed by the NetBSD
+      Foundation, Inc. and its contributors.
 
 Digium did not implement the codecs in Asterisk.  Here is the copyright on the
 GSM source:

Modified: team/oej/dialplan-ami-amievents/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/Makefile?rev=27387&r1=27386&r2=27387&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/Makefile (original)
+++ team/oej/dialplan-ami-amievents/Makefile Tue May 16 11:01:50 2006
@@ -15,22 +15,21 @@
 
 # Create OPTIONS variable
 OPTIONS=
+
 # If cross compiling, define these to suit
-# CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
-# CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
-# CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
-CC=$(CROSS_COMPILE)gcc
-HOST_CC=gcc
-# CROSS_ARCH=Linux
-# CROSS_PROC=arm
-# SUB_PROC=xscale # or maverick
+#CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
+#CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
+#CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_ARCH=Linux
+#CROSS_PROC=arm
+#SUB_PROC=xscale # or maverick
 
 ifeq ($(CROSS_COMPILE),)
   OSARCH=$(shell uname -s)
-  OSREV=$(shell uname -r)
+  PROC?=$(shell uname -m)
 else
   OSARCH=$(CROSS_ARCH)
-  OSREV=$(CROSS_REV)
+  PROC=$(CROSS_PROC)
 endif
 
 PWD=$(shell pwd)
@@ -38,14 +37,14 @@
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
 
-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
-######### More GSM codec optimization
-######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-######### which support MMX instructions.  This should be newer pentiums,
-######### ppro's, etc, as well as the AMD K6 and K7.  
+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,
+# ppro's, etc, as well as the AMD K6 and K7.  
 #K6OPT  = -DK6OPT
 
-#Tell gcc to optimize the code
+# Tell gcc to optimize the code
 OPTIMIZE+=-O6
 else
   # Stack backtraces, while useful for debugging, are incompatible with optimizations
@@ -54,147 +53,124 @@
   endif
 endif
 
-#Overwite config files on "make samples"
+# Overwite config files on "make samples"
 OVERWRITE=y
 
-#Include debug and macro symbols in the executables (-g) and profiling info (-pg)
-DEBUG=-g3 #-pg
-
-#Set NOCRYPTO to yes if you do not want to have crypto support or 
-#dependencies
-#NOCRYPTO=yes
-
-# If you are running a radio application, define RADIO_RELAX so that the DTMF
-# will be received more reliably
-#OPTIONS += -DRADIO_RELAX
-
-# If you don't have a lot of memory (e.g. embedded Asterisk), define LOW_MEMORY
-# to reduce the size of certain static buffers
-
-#ifneq ($(CROSS_COMPILE),)
-#OPTIONS += -DLOW_MEMORY
-#endif
-
-#
-# Asterisk SMDI integration
-#
-WITH_SMDI = 1
-
-# Optional debugging parameters
-DEBUG_THREADS = #-DDUMP_SCHEDULER #-DDEBUG_SCHEDULER #-DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
-
-# 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
-INSTALL_PREFIX?=
+# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
+DEBUG=-g3
 
 # Staging directory
 # Files are copied here temporarily during the install process
 # For example, make DESTDIR=/tmp/asterisk woud put things in
 # /tmp/asterisk/etc/asterisk
-# XXX watch out, put no spaces or comments after the value
+# !!! Watch out, put no spaces or comments after the value !!!
 DESTDIR?=
 #DESTDIR?=/tmp/asterisk
 
 # Original busydetect routine
-BUSYDETECT = #-DBUSYDETECT
+#BUSYDETECT = -DBUSYDETECT
 
 # Improved busydetect routine, comment the previous one if you use this one
-BUSYDETECT+= #-DBUSYDETECT_MARTIN 
+#BUSYDETECT+= -DBUSYDETECT_MARTIN 
 # Detect the busy signal looking only at tone lengths
 # For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
-BUSYDETECT+= #-DBUSYDETECT_TONEONLY
+#BUSYDETECT+= -DBUSYDETECT_TONEONLY
 # Enforce the detection of busy signal (get rid of false hangups)
 # Don't use together with -DBUSYDETECT_TONEONLY
-BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
-
-ifneq ($(OSARCH),SunOS)
+#BUSYDETECT+= -DBUSYDETECT_COMPARE_TONE_AND_SILENCE
+
+# Define standard directories for various platforms
+# These apply if they are not redefined in asterisk.conf 
+ifeq ($(OSARCH),SunOS)
+  ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
+  ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
+  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
+  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
+  ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
+  ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
+  ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
+  ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
+  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
+  ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
+else
+ifeq ($(OSARCH),FreeBSD)
+  PREFIX?=/usr/local
+  ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
+  ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
+  ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
+  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+  ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
+  ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
+  ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
+  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+  ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
+else
+  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
   ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
   ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
   ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
   ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
   ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
   ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
   ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
   ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
   ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
-  MODULES_DIR=$(ASTLIBDIR)/modules
-  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-else

[... 91628 lines stripped ...]


More information about the asterisk-commits mailing list