[asterisk-commits] branch oej/metermaids-trunk r34149 - in /team/oej/metermaids-trunk: ./ apps/ ...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Wed Jun 14 09:03:36 MST 2006 

Author: oej
Date: Wed Jun 14 11:03:33 2006
New Revision: 34149

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

Added:
    team/oej/metermaids-trunk/abstract_jb.c
      - copied unchanged from r34090, trunk/abstract_jb.c
    team/oej/metermaids-trunk/apps/app_followme.c
      - copied unchanged from r34090, trunk/apps/app_followme.c
    team/oej/metermaids-trunk/cdr/cdr_radius.c
      - copied unchanged from r34090, trunk/cdr/cdr_radius.c
    team/oej/metermaids-trunk/channels/chan_jingle.c
      - copied unchanged from r34090, trunk/channels/chan_jingle.c
    team/oej/metermaids-trunk/configs/followme.conf.sample
      - copied unchanged from r34090, trunk/configs/followme.conf.sample
    team/oej/metermaids-trunk/configs/jabber.conf.sample
      - copied unchanged from r34090, trunk/configs/jabber.conf.sample
    team/oej/metermaids-trunk/configs/jingle.conf.sample
      - copied unchanged from r34090, trunk/configs/jingle.conf.sample
    team/oej/metermaids-trunk/contrib/dictionary.digium
      - copied unchanged from r34090, trunk/contrib/dictionary.digium
    team/oej/metermaids-trunk/contrib/utils/zones2indications.c
      - copied unchanged from r34090, trunk/contrib/utils/zones2indications.c
    team/oej/metermaids-trunk/doc/callfiles.txt
      - copied unchanged from r34090, trunk/doc/callfiles.txt
    team/oej/metermaids-trunk/doc/jabber.txt
      - copied unchanged from r34090, trunk/doc/jabber.txt
    team/oej/metermaids-trunk/doc/jingle.txt
      - copied unchanged from r34090, trunk/doc/jingle.txt
    team/oej/metermaids-trunk/doc/radius.txt
      - copied unchanged from r34090, trunk/doc/radius.txt
    team/oej/metermaids-trunk/doc/video.txt
      - copied unchanged from r34090, trunk/doc/video.txt
    team/oej/metermaids-trunk/fixedjitterbuf.c
      - copied unchanged from r34090, trunk/fixedjitterbuf.c
    team/oej/metermaids-trunk/fixedjitterbuf.h
      - copied unchanged from r34090, trunk/fixedjitterbuf.h
    team/oej/metermaids-trunk/funcs/func_global.c
      - copied unchanged from r34090, trunk/funcs/func_global.c
    team/oej/metermaids-trunk/include/asterisk/abstract_jb.h
      - copied unchanged from r34090, trunk/include/asterisk/abstract_jb.h
    team/oej/metermaids-trunk/include/asterisk/autoconfig.h.in
      - copied unchanged from r34090, trunk/include/asterisk/autoconfig.h.in
    team/oej/metermaids-trunk/include/asterisk/jabber.h
      - copied unchanged from r34090, trunk/include/asterisk/jabber.h
    team/oej/metermaids-trunk/include/asterisk/jingle.h
      - copied unchanged from r34090, trunk/include/asterisk/jingle.h
    team/oej/metermaids-trunk/res/res_jabber.c
      - copied unchanged from r34090, trunk/res/res_jabber.c
    team/oej/metermaids-trunk/sounds/Makefile
      - copied unchanged from r34090, trunk/sounds/Makefile
    team/oej/metermaids-trunk/sounds/sounds.xml
      - copied unchanged from r34090, trunk/sounds/sounds.xml
Removed:
    team/oej/metermaids-trunk/include/autoconfig.h.in
    team/oej/metermaids-trunk/sounds/agent-alreadyon.gsm
    team/oej/metermaids-trunk/sounds/agent-incorrect.gsm
    team/oej/metermaids-trunk/sounds/agent-loggedoff.gsm
    team/oej/metermaids-trunk/sounds/agent-loginok.gsm
    team/oej/metermaids-trunk/sounds/agent-newlocation.gsm
    team/oej/metermaids-trunk/sounds/agent-pass.gsm
    team/oej/metermaids-trunk/sounds/agent-user.gsm
    team/oej/metermaids-trunk/sounds/auth-incorrect.gsm
    team/oej/metermaids-trunk/sounds/auth-thankyou.gsm
    team/oej/metermaids-trunk/sounds/beep.gsm
    team/oej/metermaids-trunk/sounds/beeperr.gsm
    team/oej/metermaids-trunk/sounds/conf-adminmenu.gsm
    team/oej/metermaids-trunk/sounds/conf-enteringno.gsm
    team/oej/metermaids-trunk/sounds/conf-errormenu.gsm
    team/oej/metermaids-trunk/sounds/conf-getchannel.gsm
    team/oej/metermaids-trunk/sounds/conf-getconfno.gsm
    team/oej/metermaids-trunk/sounds/conf-getpin.gsm
    team/oej/metermaids-trunk/sounds/conf-hasjoin.gsm
    team/oej/metermaids-trunk/sounds/conf-hasleft.gsm
    team/oej/metermaids-trunk/sounds/conf-invalid.gsm
    team/oej/metermaids-trunk/sounds/conf-invalidpin.gsm
    team/oej/metermaids-trunk/sounds/conf-kicked.gsm
    team/oej/metermaids-trunk/sounds/conf-leaderhasleft.gsm
    team/oej/metermaids-trunk/sounds/conf-locked.gsm
    team/oej/metermaids-trunk/sounds/conf-lockednow.gsm
    team/oej/metermaids-trunk/sounds/conf-muted.gsm
    team/oej/metermaids-trunk/sounds/conf-noempty.gsm
    team/oej/metermaids-trunk/sounds/conf-onlyone.gsm
    team/oej/metermaids-trunk/sounds/conf-onlyperson.gsm
    team/oej/metermaids-trunk/sounds/conf-otherinparty.gsm
    team/oej/metermaids-trunk/sounds/conf-placeintoconf.gsm
    team/oej/metermaids-trunk/sounds/conf-thereare.gsm
    team/oej/metermaids-trunk/sounds/conf-unlockednow.gsm
    team/oej/metermaids-trunk/sounds/conf-unmuted.gsm
    team/oej/metermaids-trunk/sounds/conf-usermenu.gsm
    team/oej/metermaids-trunk/sounds/conf-userswilljoin.gsm
    team/oej/metermaids-trunk/sounds/conf-userwilljoin.gsm
    team/oej/metermaids-trunk/sounds/conf-waitforleader.gsm
    team/oej/metermaids-trunk/sounds/demo-abouttotry.gsm
    team/oej/metermaids-trunk/sounds/demo-congrats.gsm
    team/oej/metermaids-trunk/sounds/demo-echodone.gsm
    team/oej/metermaids-trunk/sounds/demo-echotest.gsm
    team/oej/metermaids-trunk/sounds/demo-enterkeywords.gsm
    team/oej/metermaids-trunk/sounds/demo-instruct.gsm
    team/oej/metermaids-trunk/sounds/demo-moreinfo.gsm
    team/oej/metermaids-trunk/sounds/demo-nogo.gsm
    team/oej/metermaids-trunk/sounds/demo-nomatch.gsm
    team/oej/metermaids-trunk/sounds/demo-thanks.gsm
    team/oej/metermaids-trunk/sounds/dictate/
    team/oej/metermaids-trunk/sounds/digits/
    team/oej/metermaids-trunk/sounds/dir-instr.gsm
    team/oej/metermaids-trunk/sounds/dir-intro-fn.gsm
    team/oej/metermaids-trunk/sounds/dir-intro.gsm
    team/oej/metermaids-trunk/sounds/dir-nomatch.gsm
    team/oej/metermaids-trunk/sounds/dir-nomore.gsm
    team/oej/metermaids-trunk/sounds/fpm-calm-river.mp3
    team/oej/metermaids-trunk/sounds/fpm-sunshine.mp3
    team/oej/metermaids-trunk/sounds/fpm-world-mix.mp3
    team/oej/metermaids-trunk/sounds/hello-world.gsm
    team/oej/metermaids-trunk/sounds/hours.gsm
    team/oej/metermaids-trunk/sounds/invalid.gsm
    team/oej/metermaids-trunk/sounds/letters/
    team/oej/metermaids-trunk/sounds/minutes.gsm
    team/oej/metermaids-trunk/sounds/pbx-invalid.gsm
    team/oej/metermaids-trunk/sounds/pbx-invalidpark.gsm
    team/oej/metermaids-trunk/sounds/pbx-transfer.gsm
    team/oej/metermaids-trunk/sounds/phonetic/
    team/oej/metermaids-trunk/sounds/priv-callee-options.gsm
    team/oej/metermaids-trunk/sounds/priv-callpending.gsm
    team/oej/metermaids-trunk/sounds/priv-introsaved.gsm
    team/oej/metermaids-trunk/sounds/priv-recordintro.gsm
    team/oej/metermaids-trunk/sounds/privacy-incorrect.gsm
    team/oej/metermaids-trunk/sounds/privacy-prompt.gsm
    team/oej/metermaids-trunk/sounds/privacy-thankyou.gsm
    team/oej/metermaids-trunk/sounds/privacy-unident.gsm
    team/oej/metermaids-trunk/sounds/queue-callswaiting.gsm
    team/oej/metermaids-trunk/sounds/queue-holdtime.gsm
    team/oej/metermaids-trunk/sounds/queue-less-than.gsm
    team/oej/metermaids-trunk/sounds/queue-minutes.gsm
    team/oej/metermaids-trunk/sounds/queue-periodic-announce.gsm
    team/oej/metermaids-trunk/sounds/queue-reporthold.gsm
    team/oej/metermaids-trunk/sounds/queue-seconds.gsm
    team/oej/metermaids-trunk/sounds/queue-thankyou.gsm
    team/oej/metermaids-trunk/sounds/queue-thereare.gsm
    team/oej/metermaids-trunk/sounds/queue-youarenext.gsm
    team/oej/metermaids-trunk/sounds/screen-callee-options.gsm
    team/oej/metermaids-trunk/sounds/seconds.gsm
    team/oej/metermaids-trunk/sounds/spy-agent.gsm
    team/oej/metermaids-trunk/sounds/spy-h323.gsm
    team/oej/metermaids-trunk/sounds/spy-iax.gsm
    team/oej/metermaids-trunk/sounds/spy-iax2.gsm
    team/oej/metermaids-trunk/sounds/spy-mgcp.gsm
    team/oej/metermaids-trunk/sounds/spy-sip.gsm
    team/oej/metermaids-trunk/sounds/spy-skinny.gsm
    team/oej/metermaids-trunk/sounds/spy-zap.gsm
    team/oej/metermaids-trunk/sounds/ss-noservice.gsm
    team/oej/metermaids-trunk/sounds/transfer.gsm
    team/oej/metermaids-trunk/sounds/tt-allbusy.gsm
    team/oej/metermaids-trunk/sounds/tt-monkeys.gsm
    team/oej/metermaids-trunk/sounds/tt-monkeysintro.gsm
    team/oej/metermaids-trunk/sounds/tt-somethingwrong.gsm
    team/oej/metermaids-trunk/sounds/tt-weasels.gsm
    team/oej/metermaids-trunk/sounds/vm-Cust1.gsm
    team/oej/metermaids-trunk/sounds/vm-Cust2.gsm
    team/oej/metermaids-trunk/sounds/vm-Cust3.gsm
    team/oej/metermaids-trunk/sounds/vm-Cust4.gsm
    team/oej/metermaids-trunk/sounds/vm-Cust5.gsm
    team/oej/metermaids-trunk/sounds/vm-Family.gsm
    team/oej/metermaids-trunk/sounds/vm-Friends.gsm
    team/oej/metermaids-trunk/sounds/vm-INBOX.gsm
    team/oej/metermaids-trunk/sounds/vm-Old.gsm
    team/oej/metermaids-trunk/sounds/vm-Work.gsm
    team/oej/metermaids-trunk/sounds/vm-advopts.gsm
    team/oej/metermaids-trunk/sounds/vm-and.gsm
    team/oej/metermaids-trunk/sounds/vm-calldiffnum.gsm
    team/oej/metermaids-trunk/sounds/vm-changeto.gsm
    team/oej/metermaids-trunk/sounds/vm-delete.gsm
    team/oej/metermaids-trunk/sounds/vm-deleted.gsm
    team/oej/metermaids-trunk/sounds/vm-dialout.gsm
    team/oej/metermaids-trunk/sounds/vm-enter-num-to-call.gsm
    team/oej/metermaids-trunk/sounds/vm-extension.gsm
    team/oej/metermaids-trunk/sounds/vm-first.gsm
    team/oej/metermaids-trunk/sounds/vm-for.gsm
    team/oej/metermaids-trunk/sounds/vm-forward.gsm
    team/oej/metermaids-trunk/sounds/vm-forwardoptions.gsm
    team/oej/metermaids-trunk/sounds/vm-from-extension.gsm
    team/oej/metermaids-trunk/sounds/vm-from-phonenumber.gsm
    team/oej/metermaids-trunk/sounds/vm-from.gsm
    team/oej/metermaids-trunk/sounds/vm-goodbye.gsm
    team/oej/metermaids-trunk/sounds/vm-helpexit.gsm
    team/oej/metermaids-trunk/sounds/vm-incorrect-mailbox.gsm
    team/oej/metermaids-trunk/sounds/vm-incorrect.gsm
    team/oej/metermaids-trunk/sounds/vm-instructions.gsm
    team/oej/metermaids-trunk/sounds/vm-intro.gsm
    team/oej/metermaids-trunk/sounds/vm-isonphone.gsm
    team/oej/metermaids-trunk/sounds/vm-isunavail.gsm
    team/oej/metermaids-trunk/sounds/vm-last.gsm
    team/oej/metermaids-trunk/sounds/vm-leavemsg.gsm
    team/oej/metermaids-trunk/sounds/vm-login.gsm
    team/oej/metermaids-trunk/sounds/vm-mailboxfull.gsm
    team/oej/metermaids-trunk/sounds/vm-message.gsm
    team/oej/metermaids-trunk/sounds/vm-messages.gsm
    team/oej/metermaids-trunk/sounds/vm-minutes.gsm
    team/oej/metermaids-trunk/sounds/vm-mismatch.gsm
    team/oej/metermaids-trunk/sounds/vm-msginstruct.gsm
    team/oej/metermaids-trunk/sounds/vm-msgsaved.gsm
    team/oej/metermaids-trunk/sounds/vm-newpassword.gsm
    team/oej/metermaids-trunk/sounds/vm-newuser.gsm
    team/oej/metermaids-trunk/sounds/vm-next.gsm
    team/oej/metermaids-trunk/sounds/vm-no.gsm
    team/oej/metermaids-trunk/sounds/vm-nobodyavail.gsm
    team/oej/metermaids-trunk/sounds/vm-nobox.gsm
    team/oej/metermaids-trunk/sounds/vm-nomore.gsm
    team/oej/metermaids-trunk/sounds/vm-nonumber.gsm
    team/oej/metermaids-trunk/sounds/vm-num-i-have.gsm
    team/oej/metermaids-trunk/sounds/vm-onefor.gsm
    team/oej/metermaids-trunk/sounds/vm-options.gsm
    team/oej/metermaids-trunk/sounds/vm-opts.gsm
    team/oej/metermaids-trunk/sounds/vm-passchanged.gsm
    team/oej/metermaids-trunk/sounds/vm-password.gsm
    team/oej/metermaids-trunk/sounds/vm-press.gsm
    team/oej/metermaids-trunk/sounds/vm-prev.gsm
    team/oej/metermaids-trunk/sounds/vm-reachoper.gsm
    team/oej/metermaids-trunk/sounds/vm-rec-busy.gsm
    team/oej/metermaids-trunk/sounds/vm-rec-name.gsm
    team/oej/metermaids-trunk/sounds/vm-rec-temp.gsm
    team/oej/metermaids-trunk/sounds/vm-rec-unv.gsm
    team/oej/metermaids-trunk/sounds/vm-received.gsm
    team/oej/metermaids-trunk/sounds/vm-reenterpassword.gsm
    team/oej/metermaids-trunk/sounds/vm-repeat.gsm
    team/oej/metermaids-trunk/sounds/vm-review.gsm
    team/oej/metermaids-trunk/sounds/vm-saved.gsm
    team/oej/metermaids-trunk/sounds/vm-savedto.gsm
    team/oej/metermaids-trunk/sounds/vm-savefolder.gsm
    team/oej/metermaids-trunk/sounds/vm-savemessage.gsm
    team/oej/metermaids-trunk/sounds/vm-saveoper.gsm
    team/oej/metermaids-trunk/sounds/vm-sorry.gsm
    team/oej/metermaids-trunk/sounds/vm-star-cancel.gsm
    team/oej/metermaids-trunk/sounds/vm-starmain.gsm
    team/oej/metermaids-trunk/sounds/vm-tempgreetactive.gsm
    team/oej/metermaids-trunk/sounds/vm-tempgreeting.gsm
    team/oej/metermaids-trunk/sounds/vm-tempgreeting2.gsm
    team/oej/metermaids-trunk/sounds/vm-tempremoved.gsm
    team/oej/metermaids-trunk/sounds/vm-then-pound.gsm
    team/oej/metermaids-trunk/sounds/vm-theperson.gsm
    team/oej/metermaids-trunk/sounds/vm-tocallback.gsm
    team/oej/metermaids-trunk/sounds/vm-tocallnum.gsm
    team/oej/metermaids-trunk/sounds/vm-tocancel.gsm
    team/oej/metermaids-trunk/sounds/vm-tocancelmsg.gsm
    team/oej/metermaids-trunk/sounds/vm-toenternumber.gsm
    team/oej/metermaids-trunk/sounds/vm-toforward.gsm
    team/oej/metermaids-trunk/sounds/vm-tohearenv.gsm
    team/oej/metermaids-trunk/sounds/vm-tomakecall.gsm
    team/oej/metermaids-trunk/sounds/vm-tooshort.gsm
    team/oej/metermaids-trunk/sounds/vm-toreply.gsm
    team/oej/metermaids-trunk/sounds/vm-torerecord.gsm
    team/oej/metermaids-trunk/sounds/vm-undelete.gsm
    team/oej/metermaids-trunk/sounds/vm-undeleted.gsm
    team/oej/metermaids-trunk/sounds/vm-unknown-caller.gsm
    team/oej/metermaids-trunk/sounds/vm-whichbox.gsm
    team/oej/metermaids-trunk/sounds/vm-youhave.gsm
Modified:
    team/oej/metermaids-trunk/   (props changed)
    team/oej/metermaids-trunk/.cleancount
    team/oej/metermaids-trunk/CREDITS
    team/oej/metermaids-trunk/Makefile
    team/oej/metermaids-trunk/UPGRADE.txt
    team/oej/metermaids-trunk/acinclude.m4
    team/oej/metermaids-trunk/acl.c
    team/oej/metermaids-trunk/app.c
    team/oej/metermaids-trunk/apps/Makefile
    team/oej/metermaids-trunk/apps/app_adsiprog.c
    team/oej/metermaids-trunk/apps/app_alarmreceiver.c
    team/oej/metermaids-trunk/apps/app_amd.c
    team/oej/metermaids-trunk/apps/app_authenticate.c
    team/oej/metermaids-trunk/apps/app_cdr.c
    team/oej/metermaids-trunk/apps/app_chanisavail.c
    team/oej/metermaids-trunk/apps/app_channelredirect.c
    team/oej/metermaids-trunk/apps/app_chanspy.c
    team/oej/metermaids-trunk/apps/app_controlplayback.c
    team/oej/metermaids-trunk/apps/app_db.c
    team/oej/metermaids-trunk/apps/app_dial.c
    team/oej/metermaids-trunk/apps/app_dictate.c
    team/oej/metermaids-trunk/apps/app_directed_pickup.c
    team/oej/metermaids-trunk/apps/app_directory.c
    team/oej/metermaids-trunk/apps/app_disa.c
    team/oej/metermaids-trunk/apps/app_dumpchan.c
    team/oej/metermaids-trunk/apps/app_echo.c
    team/oej/metermaids-trunk/apps/app_exec.c
    team/oej/metermaids-trunk/apps/app_externalivr.c
    team/oej/metermaids-trunk/apps/app_festival.c
    team/oej/metermaids-trunk/apps/app_flash.c
    team/oej/metermaids-trunk/apps/app_forkcdr.c
    team/oej/metermaids-trunk/apps/app_getcpeid.c
    team/oej/metermaids-trunk/apps/app_hasnewvoicemail.c
    team/oej/metermaids-trunk/apps/app_ices.c
    team/oej/metermaids-trunk/apps/app_image.c
    team/oej/metermaids-trunk/apps/app_ivrdemo.c
    team/oej/metermaids-trunk/apps/app_lookupblacklist.c
    team/oej/metermaids-trunk/apps/app_lookupcidname.c
    team/oej/metermaids-trunk/apps/app_macro.c
    team/oej/metermaids-trunk/apps/app_meetme.c
    team/oej/metermaids-trunk/apps/app_milliwatt.c
    team/oej/metermaids-trunk/apps/app_mixmonitor.c
    team/oej/metermaids-trunk/apps/app_morsecode.c
    team/oej/metermaids-trunk/apps/app_mp3.c
    team/oej/metermaids-trunk/apps/app_nbscat.c
    team/oej/metermaids-trunk/apps/app_osplookup.c
    team/oej/metermaids-trunk/apps/app_page.c
    team/oej/metermaids-trunk/apps/app_parkandannounce.c
    team/oej/metermaids-trunk/apps/app_playback.c
    team/oej/metermaids-trunk/apps/app_privacy.c
    team/oej/metermaids-trunk/apps/app_queue.c
    team/oej/metermaids-trunk/apps/app_random.c
    team/oej/metermaids-trunk/apps/app_read.c
    team/oej/metermaids-trunk/apps/app_readfile.c
    team/oej/metermaids-trunk/apps/app_realtime.c
    team/oej/metermaids-trunk/apps/app_record.c
    team/oej/metermaids-trunk/apps/app_rpt.c
    team/oej/metermaids-trunk/apps/app_sayunixtime.c
    team/oej/metermaids-trunk/apps/app_senddtmf.c
    team/oej/metermaids-trunk/apps/app_sendtext.c
    team/oej/metermaids-trunk/apps/app_setcallerid.c
    team/oej/metermaids-trunk/apps/app_setcdruserfield.c
    team/oej/metermaids-trunk/apps/app_settransfercapability.c
    team/oej/metermaids-trunk/apps/app_skel.c
    team/oej/metermaids-trunk/apps/app_sms.c
    team/oej/metermaids-trunk/apps/app_softhangup.c
    team/oej/metermaids-trunk/apps/app_speech_utils.c
    team/oej/metermaids-trunk/apps/app_stack.c
    team/oej/metermaids-trunk/apps/app_system.c
    team/oej/metermaids-trunk/apps/app_talkdetect.c
    team/oej/metermaids-trunk/apps/app_test.c
    team/oej/metermaids-trunk/apps/app_transfer.c
    team/oej/metermaids-trunk/apps/app_url.c
    team/oej/metermaids-trunk/apps/app_userevent.c
    team/oej/metermaids-trunk/apps/app_verbose.c
    team/oej/metermaids-trunk/apps/app_voicemail.c
    team/oej/metermaids-trunk/apps/app_waitforring.c
    team/oej/metermaids-trunk/apps/app_waitforsilence.c
    team/oej/metermaids-trunk/apps/app_while.c
    team/oej/metermaids-trunk/apps/app_zapateller.c
    team/oej/metermaids-trunk/apps/app_zapbarge.c
    team/oej/metermaids-trunk/apps/app_zapras.c
    team/oej/metermaids-trunk/apps/app_zapscan.c
    team/oej/metermaids-trunk/ast_expr2.c
    team/oej/metermaids-trunk/ast_expr2.fl
    team/oej/metermaids-trunk/ast_expr2.y
    team/oej/metermaids-trunk/ast_expr2f.c
    team/oej/metermaids-trunk/asterisk.8
    team/oej/metermaids-trunk/asterisk.c
    team/oej/metermaids-trunk/astmm.c
    team/oej/metermaids-trunk/autoservice.c
    team/oej/metermaids-trunk/build_tools/cflags.xml
    team/oej/metermaids-trunk/build_tools/menuselect-deps.in
    team/oej/metermaids-trunk/build_tools/menuselect.c
    team/oej/metermaids-trunk/build_tools/menuselect.h
    team/oej/metermaids-trunk/build_tools/menuselect_curses.c
    team/oej/metermaids-trunk/build_tools/prep_moduledeps
    team/oej/metermaids-trunk/callerid.c
    team/oej/metermaids-trunk/cdr.c
    team/oej/metermaids-trunk/cdr/Makefile
    team/oej/metermaids-trunk/cdr/cdr_csv.c
    team/oej/metermaids-trunk/cdr/cdr_custom.c
    team/oej/metermaids-trunk/cdr/cdr_manager.c
    team/oej/metermaids-trunk/cdr/cdr_odbc.c
    team/oej/metermaids-trunk/cdr/cdr_pgsql.c
    team/oej/metermaids-trunk/cdr/cdr_sqlite.c
    team/oej/metermaids-trunk/cdr/cdr_tds.c
    team/oej/metermaids-trunk/channel.c
    team/oej/metermaids-trunk/channels/Makefile
    team/oej/metermaids-trunk/channels/chan_agent.c
    team/oej/metermaids-trunk/channels/chan_alsa.c
    team/oej/metermaids-trunk/channels/chan_features.c
    team/oej/metermaids-trunk/channels/chan_h323.c
    team/oej/metermaids-trunk/channels/chan_iax2.c
    team/oej/metermaids-trunk/channels/chan_local.c
    team/oej/metermaids-trunk/channels/chan_mgcp.c
    team/oej/metermaids-trunk/channels/chan_misdn.c
    team/oej/metermaids-trunk/channels/chan_nbs.c
    team/oej/metermaids-trunk/channels/chan_oss.c
    team/oej/metermaids-trunk/channels/chan_phone.c
    team/oej/metermaids-trunk/channels/chan_sip.c
    team/oej/metermaids-trunk/channels/chan_skinny.c
    team/oej/metermaids-trunk/channels/chan_vpb.c
    team/oej/metermaids-trunk/channels/chan_zap.c
    team/oej/metermaids-trunk/channels/h323/Makefile
    team/oej/metermaids-trunk/channels/h323/h323.conf.sample
    team/oej/metermaids-trunk/channels/iax2-parser.c
    team/oej/metermaids-trunk/channels/iax2-provision.c
    team/oej/metermaids-trunk/channels/misdn/chan_misdn_config.h
    team/oej/metermaids-trunk/channels/misdn/ie.c
    team/oej/metermaids-trunk/channels/misdn/isdn_lib.c
    team/oej/metermaids-trunk/channels/misdn/isdn_lib.h
    team/oej/metermaids-trunk/channels/misdn/isdn_msg_parser.c
    team/oej/metermaids-trunk/channels/misdn_config.c
    team/oej/metermaids-trunk/chanvars.c
    team/oej/metermaids-trunk/cli.c
    team/oej/metermaids-trunk/codecs/Makefile
    team/oej/metermaids-trunk/codecs/codec_a_mu.c
    team/oej/metermaids-trunk/codecs/codec_adpcm.c
    team/oej/metermaids-trunk/codecs/codec_alaw.c
    team/oej/metermaids-trunk/codecs/codec_g723_1.c
    team/oej/metermaids-trunk/codecs/codec_g726.c
    team/oej/metermaids-trunk/codecs/codec_gsm.c
    team/oej/metermaids-trunk/codecs/codec_ilbc.c
    team/oej/metermaids-trunk/codecs/codec_lpc10.c
    team/oej/metermaids-trunk/codecs/codec_speex.c
    team/oej/metermaids-trunk/codecs/codec_ulaw.c
    team/oej/metermaids-trunk/codecs/gsm/Makefile
    team/oej/metermaids-trunk/codecs/gsm/src/preprocess.c
    team/oej/metermaids-trunk/codecs/lpc10/lpc10.h
    team/oej/metermaids-trunk/codecs/lpc10/lpcini.c
    team/oej/metermaids-trunk/config.c
    team/oej/metermaids-trunk/configs/alsa.conf.sample
    team/oej/metermaids-trunk/configs/cdr.conf.sample
    team/oej/metermaids-trunk/configs/extensions.conf.sample
    team/oej/metermaids-trunk/configs/features.conf.sample
    team/oej/metermaids-trunk/configs/func_odbc.conf.sample
    team/oej/metermaids-trunk/configs/indications.conf.sample
    team/oej/metermaids-trunk/configs/mgcp.conf.sample
    team/oej/metermaids-trunk/configs/misdn.conf.sample
    team/oej/metermaids-trunk/configs/musiconhold.conf.sample
    team/oej/metermaids-trunk/configs/oss.conf.sample
    team/oej/metermaids-trunk/configs/rtp.conf.sample
    team/oej/metermaids-trunk/configs/sip.conf.sample
    team/oej/metermaids-trunk/configs/skinny.conf.sample
    team/oej/metermaids-trunk/configs/voicemail.conf.sample
    team/oej/metermaids-trunk/configs/zapata.conf.sample
    team/oej/metermaids-trunk/configure
    team/oej/metermaids-trunk/configure.ac
    team/oej/metermaids-trunk/cryptostub.c
    team/oej/metermaids-trunk/db.c
    team/oej/metermaids-trunk/devicestate.c
    team/oej/metermaids-trunk/dns.c
    team/oej/metermaids-trunk/dnsmgr.c
    team/oej/metermaids-trunk/doc/asterisk-conf.txt
    team/oej/metermaids-trunk/doc/cdrdriver.txt
    team/oej/metermaids-trunk/doc/channelvariables.txt
    team/oej/metermaids-trunk/doc/smdi.txt
    team/oej/metermaids-trunk/doc/speechrec.txt
    team/oej/metermaids-trunk/dsp.c
    team/oej/metermaids-trunk/enum.c
    team/oej/metermaids-trunk/file.c
    team/oej/metermaids-trunk/formats/Makefile
    team/oej/metermaids-trunk/formats/format_g723.c
    team/oej/metermaids-trunk/formats/format_g726.c
    team/oej/metermaids-trunk/formats/format_g729.c
    team/oej/metermaids-trunk/formats/format_gsm.c
    team/oej/metermaids-trunk/formats/format_h263.c
    team/oej/metermaids-trunk/formats/format_h264.c
    team/oej/metermaids-trunk/formats/format_ilbc.c
    team/oej/metermaids-trunk/formats/format_jpeg.c
    team/oej/metermaids-trunk/formats/format_ogg_vorbis.c
    team/oej/metermaids-trunk/formats/format_pcm.c
    team/oej/metermaids-trunk/formats/format_sln.c
    team/oej/metermaids-trunk/formats/format_vox.c
    team/oej/metermaids-trunk/formats/format_wav.c
    team/oej/metermaids-trunk/formats/format_wav_gsm.c
    team/oej/metermaids-trunk/frame.c
    team/oej/metermaids-trunk/fskmodem.c
    team/oej/metermaids-trunk/funcs/Makefile
    team/oej/metermaids-trunk/funcs/func_base64.c
    team/oej/metermaids-trunk/funcs/func_callerid.c
    team/oej/metermaids-trunk/funcs/func_cdr.c
    team/oej/metermaids-trunk/funcs/func_channel.c
    team/oej/metermaids-trunk/funcs/func_curl.c
    team/oej/metermaids-trunk/funcs/func_cut.c
    team/oej/metermaids-trunk/funcs/func_db.c
    team/oej/metermaids-trunk/funcs/func_enum.c
    team/oej/metermaids-trunk/funcs/func_env.c
    team/oej/metermaids-trunk/funcs/func_groupcount.c
    team/oej/metermaids-trunk/funcs/func_language.c
    team/oej/metermaids-trunk/funcs/func_logic.c
    team/oej/metermaids-trunk/funcs/func_math.c
    team/oej/metermaids-trunk/funcs/func_md5.c
    team/oej/metermaids-trunk/funcs/func_moh.c
    team/oej/metermaids-trunk/funcs/func_odbc.c
    team/oej/metermaids-trunk/funcs/func_rand.c
    team/oej/metermaids-trunk/funcs/func_realtime.c
    team/oej/metermaids-trunk/funcs/func_sha1.c
    team/oej/metermaids-trunk/funcs/func_strings.c
    team/oej/metermaids-trunk/funcs/func_timeout.c
    team/oej/metermaids-trunk/funcs/func_uri.c
    team/oej/metermaids-trunk/http.c
    team/oej/metermaids-trunk/image.c
    team/oej/metermaids-trunk/include/   (props changed)
    team/oej/metermaids-trunk/include/asterisk/   (props changed)
    team/oej/metermaids-trunk/include/asterisk.h
    team/oej/metermaids-trunk/include/asterisk/alaw.h
    team/oej/metermaids-trunk/include/asterisk/app.h
    team/oej/metermaids-trunk/include/asterisk/astmm.h
    team/oej/metermaids-trunk/include/asterisk/callerid.h
    team/oej/metermaids-trunk/include/asterisk/channel.h
    team/oej/metermaids-trunk/include/asterisk/chanspy.h
    team/oej/metermaids-trunk/include/asterisk/compat.h
    team/oej/metermaids-trunk/include/asterisk/devicestate.h
    team/oej/metermaids-trunk/include/asterisk/dnsmgr.h
    team/oej/metermaids-trunk/include/asterisk/doxyref.h
    team/oej/metermaids-trunk/include/asterisk/endian.h
    team/oej/metermaids-trunk/include/asterisk/file.h
    team/oej/metermaids-trunk/include/asterisk/frame.h
    team/oej/metermaids-trunk/include/asterisk/linkedlists.h
    team/oej/metermaids-trunk/include/asterisk/lock.h
    team/oej/metermaids-trunk/include/asterisk/logger.h
    team/oej/metermaids-trunk/include/asterisk/options.h
    team/oej/metermaids-trunk/include/asterisk/plc.h
    team/oej/metermaids-trunk/include/asterisk/rtp.h
    team/oej/metermaids-trunk/include/asterisk/stringfields.h
    team/oej/metermaids-trunk/include/asterisk/translate.h
    team/oej/metermaids-trunk/include/asterisk/udptl.h
    team/oej/metermaids-trunk/include/asterisk/ulaw.h
    team/oej/metermaids-trunk/include/asterisk/utils.h
    team/oej/metermaids-trunk/indications.c
    team/oej/metermaids-trunk/io.c
    team/oej/metermaids-trunk/jitterbuf.c
    team/oej/metermaids-trunk/loader.c
    team/oej/metermaids-trunk/logger.c
    team/oej/metermaids-trunk/makeopts.in
    team/oej/metermaids-trunk/manager.c
    team/oej/metermaids-trunk/md5.c
    team/oej/metermaids-trunk/netsock.c
    team/oej/metermaids-trunk/pbx.c
    team/oej/metermaids-trunk/pbx/Makefile
    team/oej/metermaids-trunk/pbx/ael/ael.flex
    team/oej/metermaids-trunk/pbx/ael/ael.tab.c
    team/oej/metermaids-trunk/pbx/ael/ael.y
    team/oej/metermaids-trunk/pbx/ael/ael_lex.c
    team/oej/metermaids-trunk/pbx/dundi-parser.c
    team/oej/metermaids-trunk/pbx/pbx_ael.c
    team/oej/metermaids-trunk/pbx/pbx_config.c
    team/oej/metermaids-trunk/pbx/pbx_dundi.c
    team/oej/metermaids-trunk/pbx/pbx_gtkconsole.c
    team/oej/metermaids-trunk/pbx/pbx_loopback.c
    team/oej/metermaids-trunk/pbx/pbx_realtime.c
    team/oej/metermaids-trunk/pbx/pbx_spool.c
    team/oej/metermaids-trunk/plc.c
    team/oej/metermaids-trunk/privacy.c
    team/oej/metermaids-trunk/res/Makefile
    team/oej/metermaids-trunk/res/res_adsi.c
    team/oej/metermaids-trunk/res/res_agi.c
    team/oej/metermaids-trunk/res/res_clioriginate.c
    team/oej/metermaids-trunk/res/res_config_odbc.c
    team/oej/metermaids-trunk/res/res_config_pgsql.c
    team/oej/metermaids-trunk/res/res_convert.c
    team/oej/metermaids-trunk/res/res_crypto.c
    team/oej/metermaids-trunk/res/res_features.c
    team/oej/metermaids-trunk/res/res_indications.c
    team/oej/metermaids-trunk/res/res_monitor.c
    team/oej/metermaids-trunk/res/res_musiconhold.c
    team/oej/metermaids-trunk/res/res_odbc.c
    team/oej/metermaids-trunk/res/res_osp.c
    team/oej/metermaids-trunk/res/res_smdi.c
    team/oej/metermaids-trunk/res/res_snmp.c
    team/oej/metermaids-trunk/res/res_speech.c
    team/oej/metermaids-trunk/res/snmp/agent.c
    team/oej/metermaids-trunk/rtp.c
    team/oej/metermaids-trunk/sample.call
    team/oej/metermaids-trunk/say.c
    team/oej/metermaids-trunk/sched.c
    team/oej/metermaids-trunk/slinfactory.c
    team/oej/metermaids-trunk/sounds/   (props changed)
    team/oej/metermaids-trunk/sounds.txt
    team/oej/metermaids-trunk/srv.c
    team/oej/metermaids-trunk/stdtime/localtime.c
    team/oej/metermaids-trunk/strcompat.c
    team/oej/metermaids-trunk/tdd.c
    team/oej/metermaids-trunk/term.c
    team/oej/metermaids-trunk/translate.c
    team/oej/metermaids-trunk/udptl.c
    team/oej/metermaids-trunk/utils.c
    team/oej/metermaids-trunk/utils/Makefile
    team/oej/metermaids-trunk/utils/ael_main.c
    team/oej/metermaids-trunk/utils/astman.c
    team/oej/metermaids-trunk/utils/smsq.c

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

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

Propchange: team/oej/metermaids-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 14 11:03:33 2006
@@ -1,1 +1,1 @@
-/trunk:1-28462
+/trunk:1-34091

Modified: team/oej/metermaids-trunk/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/.cleancount?rev=34149&r1=34148&r2=34149&view=diff
==============================================================================
--- team/oej/metermaids-trunk/.cleancount (original)
+++ team/oej/metermaids-trunk/.cleancount Wed Jun 14 11:03:33 2006
@@ -1,1 +1,1 @@
-17
+19

Modified: team/oej/metermaids-trunk/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/CREDITS?rev=34149&r1=34148&r2=34149&view=diff
==============================================================================
--- team/oej/metermaids-trunk/CREDITS (original)
+++ team/oej/metermaids-trunk/CREDITS Wed Jun 14 11:03:33 2006
@@ -27,58 +27,110 @@
 * Thanks to QuickNet Technologies for their donation of an Internet
 PhoneJack and Linejack card to the project.  (http://www.quicknet.net)
 
+* Thanks to VoipSupply for their donation of Sipura ATAs to the project for
+T.38 testing. (http://www.voipsupply.com)
+
+* Thanks to Grandstream for their donation of ATAs to the project for
+T.38 testing. (http://www.grandstream.com)
+
 === MISCELLANEOUS PATCHES ===
 Jim Dixon - Zapata Telephony and app_rpt
 	http://www.zapatatelephony.org/app_rpt.html
+
 Russell Bryant - Asterisk 1.0 maintainer and misc. enhancements
 	russelb at clemson.edu
+
 Anthony Minessale II - Countless big and small fixes, and relentless forward push
 	anthmct at yahoo.com              http://www.asterlink.com
+
 James Golovich - Innumerable contributions
 	You can find him and asterisk-perl at http://asterisk.gnuinter.net
+
 Andre Bierwirth - Extension hints and status
+
 Oliver Daudey - ISDN4Linux fixes
+
 Pauline Middelink - ISDN4Linux patches and some general patches.
 	She can be found at http://www.polyware.nl/~middelink/En/
+
 Jean-Denis Girard - Various contributions from the South Pacific Islands
 	jd-girard at esoft.pf             http://www.esoft.pf
+
 William Jordan / Vonage - MySQL enhancements to Voicemail
 	wjordan at vonage.com
+
 Jac Kersing - Various fixes
+
 Steven Critchfield - Seek and Trunc functions for playback and recording
 	critch at basesys.com
+
 Jefferson Noxon - app_lookupcidname, app_db, and various other contributions
+
 Klaus-Peter Junghanns - in-band DTMF on SIP and MGCP
+
 Ross Finlayson - Dynamic RTP payload support
+
 Mahmut Fettahlioglu - Audio recording, music-on-hold changes, alaw file
 	format, and various fixes. Can be contacted at mahmut at oa.com.au
+
 James Dennis - Cisco SIP compatibility patches to work with SIP service
 	providers. Can be contacted at asterisk at jdennis.net
+
 Tilghman Lesher - ast_localtime(); ast_say_date_with_format(); 
 	GotoIfTime, Random, SayUnixTime, HasNewVoicemail applications;
 	CUT, SORT, EVAL, CURL, FIELDQTY, STRFTIME, QUEUEAGENT* functions;
 	and other innumerable bug fixes. http://asterisk.drunkcoder.com/
+
 Jayson Vantuyl - Manager protocol changes, various other bugs.
 	jvantuyl at computingedge.net
+
 Thorsten Lockert - OpenBSD, FreeBSD ports, making MacOS X port run on 10.3,
 	dialplan include verification, route lookup on OpenBSD, SNMP agent
 	support (res_snmp), various other bugs. tholo at sigmasoft.com
+
 Brian West - ODBC support and Bug Marshaling  
+
 Josh Roberson - chan_zap reload support, Advanced Voicemail Features, other misc. patches,
 	and Bug Marshalling. - josh at asteriasgi.com, http://www.asteriasgi.com
+
 William Waites - syslog support, SIP NAT traversal for SIP-UA. ww at styx.org
+
 Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin.
 	rich at whiteoaklabs.com  http://whiteoaklabs.com
+
 Simon Lockhart - Porting to Solaris (based on work of Logan ???)	
 	simon at slimey.org
+
 Olle E. Johansson - SIP RFC compliance, documentation and testing, testing, testing
 	oej at edvina.net, http://edvina.net
+
 Steve Kann - new jitter buffer for IAX2
 	stevek at stevek.com
+
 Constantine Filin - major contributions to the Asterisk Realtime Architecture
+
 Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade
+
 Claude Patry - bug fixes, feature enhancements, and bug marshalling
 	cpatry at gmail.com
+
+Miroslav Nachev, miro at space-comm.com COSMOS Software Enterprises, Ltd.
+	- for Variable for No Answer Timeout for Attended Transfer
+
+Slav Klenov & Vanheuverzwijn Joachim - development of the generic jitterbuffer
+	Securax Ltd. info at securax.be
+
+Roy Sigurd Karlsbakk - providing funding for generic jitterbuffer development
+	roy at karlsbakk.net, Briiz Telecom AS
+
+Voop A/S, Nuvio Inc and Foniris Telecom A/S - funding for rewrite of SIP transfers
+
+Philippe Sultan - RADIUS CDR module
+	INRIA, http://www.inria.fr/
+
+John Martin, Aupix - Improved video support in the SIP channel
+
+Steve Underwood - Provided T.38 pass through support.
 
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt
@@ -92,8 +144,9 @@
 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:
+Asterisk uses libedit, the lightweight readline replacement from NetBSD.
+The cdr_radius module uses libradiusclient-ng, which is also from NetBSD.
+They are BSD-licensed and require the following statement:
 
       This product includes software developed by the NetBSD
       Foundation, Inc. and its contributors.

Modified: team/oej/metermaids-trunk/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/Makefile?rev=34149&r1=34148&r2=34149&view=diff
==============================================================================
--- team/oej/metermaids-trunk/Makefile (original)
+++ team/oej/metermaids-trunk/Makefile Wed Jun 14 11:03:33 2006
@@ -13,6 +13,8 @@
 
 .EXPORT_ALL_VARIABLES:
 
+.PHONY: sounds
+
 # Create OPTIONS variable
 OPTIONS=
 
@@ -36,22 +38,6 @@
 
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
-
-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
-OPTIMIZE+=-O6
-else
-  # Stack backtraces, while useful for debugging, are incompatible with optimizations
-  ifeq (${OSARCH},Linux)
-    CFLAGS+=-DSTACK_BACKTRACES
-  endif
-endif
 
 # Overwite config files on "make samples"
 OVERWRITE=y
@@ -82,40 +68,30 @@
 # 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
+  ASTETCDIR=/etc/opt/asterisk
+  ASTLIBDIR=/opt/asterisk/lib
+  ASTVARLIBDIR=/var/opt/asterisk/lib
+  ASTSPOOLDIR=/var/opt/asterisk/spool
+  ASTLOGDIR=/var/opt/asterisk/log
+  ASTHEADERDIR=/opt/asterisk/usr/include/asterisk
+  ASTBINDIR=/opt/asterisk/usr/bin
+  ASTSBINDIR=/opt/asterisk/usr/sbin
+  ASTVARRUNDIR=/var/opt/asterisk/run
+  ASTMANDIR=/opt/asterisk/usr/share/man
 else
+  ASTETCDIR=$(sysconfdir)/asterisk
+  ASTLIBDIR=$(libdir)/asterisk
+  ASTHEADERDIR=$(includedir)/asterisk
+  ASTBINDIR=$(bindir)
+  ASTSBINDIR=$(sbindir)
+  ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+  ASTLOGDIR=$(localstatedir)/log/asterisk
+  ASTVARRUNDIR=$(localstatedir)/run
+  ASTMANDIR=$(mandir)
 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
+  ASTVARLIBDIR=$(prefix)/share/asterisk
 else
-  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
-  ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
-  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
-  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-  ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-  ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
-  ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
-  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-  ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
+  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
 endif
 endif
 ASTDATADIR?=$(ASTVARLIBDIR)
@@ -153,9 +129,32 @@
   include makeopts
 endif
 
-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..
+TOPDIR_CFLAGS=-Iinclude
+MOD_SUBDIR_CFLAGS=-I../include -I..
+OTHER_SUBDIR_CFLAGS=-I../include -I..
+
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
+  ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
+# 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
+OPTIMIZE+=-O6
+  else
+    # Stack backtraces, while useful for debugging, are incompatible with optimizations
+    ifeq (${OSARCH},Linux)
+      CFLAGS+=-DSTACK_BACKTRACES
+    endif
+  endif
+else
+  # Stack backtraces, while useful for debugging, are incompatible with optimizations
+  ifeq (${OSARCH},Linux)
+    CFLAGS+=-DSTACK_BACKTRACES
+  endif
+endif
 
 #   *CLI> show memory allocations [filename]
 #   *CLI> show memory summary [filename]

[... 65773 lines stripped ...]

More information about the asterisk-commits mailing list