[asterisk-commits] branch oej/multiparking r24290 - in /team/oej/multiparking: ./ agi/ apps/ bui...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue May 2 12:16:40 MST 2006


Author: oej
Date: Tue May  2 14:16:38 2006
New Revision: 24290

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

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

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

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

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May  2 14:16:38 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/multiparking/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May  2 14:16:38 2006
@@ -1,1 +1,1 @@
-/trunk:1-17259
+/trunk:1-24229

Modified: team/oej/multiparking/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/.cleancount?rev=24290&r1=24289&r2=24290&view=diff
==============================================================================
--- team/oej/multiparking/.cleancount (original)
+++ team/oej/multiparking/.cleancount Tue May  2 14:16:38 2006
@@ -1,1 +1,1 @@
-13
+15

Modified: team/oej/multiparking/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/CREDITS?rev=24290&r1=24289&r2=24290&view=diff
==============================================================================
--- team/oej/multiparking/CREDITS (original)
+++ team/oej/multiparking/CREDITS Tue May  2 14:16:38 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
 

Modified: team/oej/multiparking/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/Makefile?rev=24290&r1=24289&r2=24290&view=diff
==============================================================================
--- team/oej/multiparking/Makefile (original)
+++ team/oej/multiparking/Makefile Tue May  2 14:16:38 2006
@@ -15,22 +15,33 @@
 
 # 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
+#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
+
+# Pentium Pro Optimize
+#PROC=i686
+
+# Pentium & VIA processors optimize
+#PROC=i586
+
+#PROC=k6
+#PROC=ppc
+
 CC=$(CROSS_COMPILE)gcc
 HOST_CC=gcc
-# 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 +49,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,14 +65,13 @@
   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)
+# 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
+# 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
@@ -70,28 +80,22 @@
 
 # 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
 
+# If you want to debug channel locking, try this (depends on code using
+# ast_channel_lock and companions to work)
+DEBUG_THREADS += #-DDEBUG_CHANNEL_LOCKS
+
 # 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
@@ -101,7 +105,7 @@
 # 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
 
@@ -117,84 +121,99 @@
 # Don't use together with -DBUSYDETECT_TONEONLY
 BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
 
-ifneq ($(OSARCH),SunOS)
+# 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
-  ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
-  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
-  ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
-  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
-  ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
-  ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-  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
-  MODULES_DIR=$(ASTLIBDIR)/modules
-  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-endif
+endif
+endif
+ASTDATADIR?=$(ASTVARLIBDIR)
+
+# Asterisk.conf is located in ASTETCDIR or by using the -C flag
+# when starting Asterisk
+ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+MODULES_DIR=$(ASTLIBDIR)/modules
+AGI_DIR=$(ASTDATADIR)/agi-bin
+
+# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
+HTTP_DOCSDIR=/var/www/html
+# Determine by a grep 'ScriptAlias' of your Apache httpd.conf file
+HTTP_CGIDIR=/var/www/cgi-bin
 
 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
-
-# Pentium Pro Optimize
-#PROC=i686
-
-# Pentium & VIA processors optimize
-#PROC=i586
-
-#PROC=k6
-#PROC=ppc
-
-#Uncomment this to use the older DSP routines
+# Uncomment this to use the older DSP routines
 #ASTCFLAGS+=-DOLD_DSP_ROUTINES
 
-# Determine by a grep 'DocumentRoot' of your httpd.conf file
-HTTP_DOCSDIR=/var/www/html
-# Determine by a grep 'ScriptAlias' of your httpd.conf file
-HTTP_CGIDIR=/var/www/cgi-bin
-
 # 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 ($(CROSS_COMPILE),)
-    PROC?=$(shell uname -m)
-  else
-    PROC=$(CROSS_PROC)
-  endif
-
   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)
@@ -215,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
@@ -233,17 +252,19 @@
   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
 ASTOBJ=-o asterisk
 
 ifeq ($(findstring BSD,$(OSARCH)),BSD)
-  PROC=$(shell uname -m)
   ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
 endif
 
@@ -253,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)
@@ -271,22 +284,6 @@
     ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
   endif
   MPG123TARG=freebsd
-
-  # XXX FreeBSD paths
-  PREFIX?=/usr/local
-  ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
-  ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
-  ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
-  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
-  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-  ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-  ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
-  ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
-  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-  ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
-  # XXX end FreeBSD paths
-
 endif # FreeBSD
 
 ifeq ($(OSARCH),NetBSD)
@@ -304,28 +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)
-  PROC=$(shell uname -m)
-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
@@ -337,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
 
@@ -350,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 \
@@ -397,10 +376,13 @@
   AUDIO_LIBS=-framework CoreAudio
   ASTLINK=-Wl,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
-  OBJS+=poll.o
-  ASTCFLAGS+=-DPOLLCOMPAT
+  # Mac on Intel CoreDuo does not need poll compatibility layer
+  ifneq ($(PROC),i386)
+    OBJS+=poll.o
+    ASTCFLAGS+=-DPOLLCOMPAT
+  endif
 else
-#These are used for all but Darwin
+# These are used for all but Darwin
   ASTLINK=-Wl,-E 
   SOLINK=-shared -Xlinker -x
   ifeq ($(findstring BSD,$(OSARCH)),BSD)
@@ -428,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 ---------+"  
@@ -448,10 +428,32 @@
 	@echo " + cannot be run before being installed by   +"  
 	@echo " + running:                                  +"  
 	@echo " +                                           +"
-	@echo " +               $(MAKE) install                +"  

[... 64437 lines stripped ...]


More information about the asterisk-commits mailing list