[asterisk-commits] branch oej/res_auth r22379 - in /team/oej/res_auth: ./ agi/ apps/ build_tools...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Apr 25 00:10:07 MST 2006 

Author: oej
Date: Tue Apr 25 02:10:05 2006
New Revision: 22379

URL: http://svn.digium.com/view/asterisk?rev=22379&view=rev
Log:
Reset automerge, resolve conflicts in various files not touched by this patch

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

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

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

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

Propchange: team/oej/res_auth/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 25 02:10:05 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/res_auth/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 25 02:10:05 2006
@@ -1,1 +1,1 @@
-/trunk:1-19723
+/trunk:1-22363

Modified: team/oej/res_auth/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/CREDITS?rev=22379&r1=22378&r2=22379&view=diff
==============================================================================
--- team/oej/res_auth/CREDITS (original)
+++ team/oej/res_auth/CREDITS Tue Apr 25 02:10:05 2006
@@ -76,7 +76,7 @@
 Steve Kann - new jitter buffer for IAX2
 	stevek at stevek.com
 Constantine Filin - major contributions to the Asterisk Realtime Architecture
-Steve Murphy - privacy support
+Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade
 Claude Patry - bug fixes, feature enhancements, and bug marshalling
 	cpatry at gmail.com
 

Modified: team/oej/res_auth/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/res_auth/Makefile?rev=22379&r1=22378&r2=22379&view=diff
==============================================================================
--- team/oej/res_auth/Makefile (original)
+++ team/oej/res_auth/Makefile Tue Apr 25 02:10:05 2006
@@ -49,7 +49,7 @@
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
 
-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
 # More GSM codec optimization
 # Uncomment to enable MMXTM optimizations for x86 architecture CPU's
 # which support MMX instructions.  This should be newer pentiums,
@@ -90,15 +90,12 @@
 # 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
@@ -163,12 +160,13 @@
   ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
 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=$(ASTVARLIBDIR)/agi-bin
+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
@@ -177,25 +175,38 @@
 
 ASTCFLAGS=
 
-# Define this to use files larger than 2GB (useful for sound files longer than 37 hours and logfiles)
-ASTCFLAGS+=-D_FILE_OFFSET_BITS=64
-
 # Uncomment this to use the older DSP routines
 #ASTCFLAGS+=-DOLD_DSP_ROUTINES
 
 # If the file .asterisk.makeopts is present in your home directory, you can
-# include all of your favorite Makefile options so that every time you download
-# a new version of Asterisk, you don't have to edit the makefile to set them. 
-# The file, /etc/asterisk.makeopts will also be included, but can be overridden
+# include all of your favorite menuselect options so that every time you download
+# a new version of Asterisk, you don't have to run menuselect to set them. 
+# The file /etc/asterisk.makeopts will also be included but can be overridden
 # by the file in your home directory.
 
-ifneq ($(wildcard /etc/asterisk.makeopts),)
-  include /etc/asterisk.makeopts
-endif
-
-ifneq ($(wildcard ~/.asterisk.makeopts),)
-  include ~/.asterisk.makeopts
-endif
+GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
+USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
+
+ifneq ($(wildcard menuselect.makeopts),)
+  include menuselect.makeopts
+endif
+
+ifneq ($(wildcard makeopts),)
+  include makeopts
+endif
+
+ASTCFLAGS+=$(MENUSELECT_CFLAGS)
+TOPDIR_CFLAGS=-include include/autoconfig.h
+MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h
+
+#   *CLI> show memory allocations [filename]
+#   *CLI> show memory summary [filename]
+ifneq ($(findstring -DMALLOC_DEBUG,$(ASTCFLAGS)),)
+  TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
+  MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
+endif
+
+MOD_SUBDIR_CFLAGS+=-fPIC
 
 ifeq ($(OSARCH),Linux)
   ifeq ($(PROC),x86_64)
@@ -242,9 +253,13 @@
 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
@@ -260,14 +275,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)
@@ -295,27 +302,11 @@
   INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
 endif
 
-ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
-  CYGLOADER=cygwin_a
-  OSARCH=CYGWIN
-  ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
-  ASTLINK=
-  LIBS+=-lpthread -lncurses -lm -lresolv
-  ASTSBINDIR=$(MODULES_DIR)
-endif
-
-ifndef WITHOUT_ZAPTEL
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
-  ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
-endif
-
-endif # WITHOUT_ZAPTEL
-
 LIBEDIT=editline/libedit.a
 
+ASTERISKVERSION:=$(shell build_tools/make_version .)
+
 ifneq ($(wildcard .version),)
-  ASTERISKVERSION:=$(shell cat .version)
   ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
   RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
 else
@@ -327,11 +318,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
 
@@ -340,11 +329,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 \
@@ -421,19 +411,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 ---------+"  
@@ -441,10 +429,32 @@
 	@echo " + cannot be run before being installed by   +"  
 	@echo " + running:                                  +"  
 	@echo " +                                           +"
-	@echo " +               $(MAKE) install                +"  
+	@echo " +               make install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: cleantest depend asterisk subdirs 
+all: include/autoconfig.h menuselect.makeopts cleantest depend asterisk subdirs
+
+configure:
+	- at ./bootstrap.sh
+
+include/autoconfig.h: configure
+	@CFLAGS="" ./configure
+	@echo "****"
+	@echo "**** The configure script was just executed, so 'make' needs to be"
+	@echo "**** restarted."
+	@echo "****"
+	@exit 1
+
+makeopts: configure
+	@CFLAGS="" ./configure
+	@echo "****"
+	@echo "**** The configure script was just executed, so 'make' needs to be"
+	@echo "**** restarted."
+	@echo "****"
+	@exit 1
+
+menuselect.makeopts: build_tools/menuselect makeopts.xml
+	@build_tools/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
 
 #ifneq ($(wildcard tags),)
 ctags: tags
@@ -454,16 +464,14 @@
 all: TAGS
 endif
 
-noclean: depend asterisk subdirs
-
 editline/config.h:
 	cd editline && unset CFLAGS LIBS && ./configure ; \
 
-editline/libedit.a: FORCE
+editline/libedit.a:
 	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
 	$(MAKE) -C editline libedit.a
 
-db1-ast/libdb1.a: FORCE
+db1-ast/libdb1.a:
 	$(MAKE) -C db1-ast libdb1.a
 
 res_auth.so: res_auth.o 
@@ -512,27 +520,24 @@
 asterisk.txt: asterisk.sgml
 	docbook2txt asterisk.sgml
 
-defaults.h: FORCE
+defaults.h: makeopts
 	build_tools/make_defaults_h > $@.tmp
 	if cmp -s $@.tmp $@ ; then echo ; else \
 		mv $@.tmp $@ ; \
 	fi
 	rm -f $@.tmp
 
-include/asterisk/version.h: FORCE
+include/asterisk/version.h:
 	build_tools/make_version_h > $@.tmp
 	if cmp -s $@.tmp $@ ; then echo; else \
 		mv $@.tmp $@ ; \
 	fi
 	rm -f $@.tmp
 
-stdtime/libtime.a: FORCE
-	$(MAKE) -C stdtime libtime.a
-
-cygwin_a:
-	$(MAKE) -C cygwin all
-
-asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
+stdtime/libtime.a:
+	CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C stdtime libtime.a
+
+asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
 	build_tools/make_build_h > include/asterisk/build.h.tmp
 	if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
 		mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
@@ -545,7 +550,9 @@
 	$(CC) $(AUDIO_LIBS) -o muted muted.o
 
 subdirs: 
-	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
+	for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
+	CFLAGS="$(ASTCFLAGS)" $(MAKE) -C utils
+	CFLAGS="$(ASTCFLAGS) -include ../include/autoconfig.h" $(MAKE) -C agi
 
 clean-depend:
 	for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
@@ -563,47 +570,54 @@
 	$(MAKE) -C db1-ast clean
 	$(MAKE) -C stdtime clean
 
+dist-clean: clean
+	rm -f menuselect.makeopts makeopts makeopts.xml
+	rm -f config.log config.status
+	rm -f include/autoconfig.h
+	$(MAKE) -C mxml clean
+	$(MAKE) -C build_tools dist-clean
+
 datafiles: all
 	if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
-	# Should static HTTP be installed during make samples or even with its own target ala
-	# webvoicemail?  There are portions here that *could* be customized but might also be
-	# improved a lot.  I'll put it here for now.
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/static-http
+# Should static HTTP be installed during make samples or even with its own target ala
+# webvoicemail?  There are portions here that *could* be customized but might also be
+# improved a lot.  I'll put it here for now.
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
 	for x in static-http/*; do \
-		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/static-http ; \
-	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
+		install -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+	done
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
 	for x in sounds/digits/*.gsm; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/digits ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/dictate
 	for x in sounds/dictate/*.gsm; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/dictate ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/letters
 	for x in sounds/letters/*.gsm; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/letters ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/phonetic
 	for x in sounds/phonetic/*.gsm; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/phonetic ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
@@ -611,16 +625,16 @@
 	done
 	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
 	for x in images/*.jpg; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
 	done
 	mkdir -p $(DESTDIR)$(AGI_DIR)
 
@@ -665,7 +679,6 @@
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
 	if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
-	if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
 	if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
 	ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
 	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
@@ -680,21 +693,21 @@
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
-	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 	if [ -d contrib/firmware/iax ]; then \
-		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
 	else \
 		echo "You need to do cvs update -d not just cvs update" ; \
 	fi 
@@ -781,6 +794,7 @@
 		echo "astetcdir => $(ASTETCDIR)" ; \
 		echo "astmoddir => $(MODULES_DIR)" ; \
 		echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
+		echo "astdatadir => $(ASTDATADIR)" ; \
 		echo "astagidir => $(AGI_DIR)" ; \
 		echo "astspooldir => $(ASTSPOOLDIR)" ; \
 		echo "astrundir => $(ASTVARRUNDIR)" ; \
@@ -798,28 +812,28 @@
 	else \
 		echo "Skipping asterisk.conf creation"; \
 	fi
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds ; \
 	for x in sounds/demo-*; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
 	for x in sounds/*.mp3; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-	done
-	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
+	done
+	rm -f $(DESTDIR)$(ASTDATADIR)/mohmp3/sample-hold.mp3
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
-		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
+		cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
 	done
 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
-		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
+		cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
 	done
 
 webvmail:
@@ -887,7 +901,7 @@
 depend: include/asterisk/version.h .depend defaults.h 
 	for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
 
-.depend: include/asterisk/version.h
+.depend: include/asterisk/version.h defaults.h
 	build_tools/mkdep $(CFLAGS) $(wildcard *.c)
 
 .tags-depend:
@@ -928,7 +942,6 @@
 # If the cleancount has been changed, force a make clean.
 # .cleancount is the global clean count, and .lastclean is the 
 # last clean count we had
-# We can avoid this by making noclean
 
 cleantest:
 	if cmp -s .cleancount .lastclean ; then echo ; else \
@@ -941,8 +954,8 @@
 	rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
 	rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
 	rm -rf $(DESTDIR)$(ASTHEADERDIR)
-	rm -rf $(DESTDIR)$(ASTVARLIBDIR)/sounds
-	rm -rf $(DESTDIR)$(ASTVARLIBDIR)/firmware
+	rm -rf $(DESTDIR)$(ASTDATADIR)/sounds
+	rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
 	rm -rf $(DESTDIR)$(ASTMANDIR)/man8
 	for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
 
@@ -963,6 +976,21 @@
 uninstall-all: _uninstall
 	rm -rf $(DESTDIR)$(ASTLIBDIR)
 	rm -rf $(DESTDIR)$(ASTVARLIBDIR)
+	rm -rf $(DESTDIR)$(ASTDATADIR)
 	rm -rf $(DESTDIR)$(ASTSPOOLDIR)
 	rm -rf $(DESTDIR)$(ASTETCDIR)
 	rm -rf $(DESTDIR)$(ASTLOGDIR)
+
+menuselect: build_tools/menuselect makeopts.xml
+	- at build_tools/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+
+build_tools/menuselect: build_tools/menuselect.c build_tools/menuselect_curses.c build_tools/menuselect.h include/autoconfig.h strcompat.o mxml/libmxml.a
+	$(MAKE) -C build_tools menuselect
+
+mxml/libmxml.a:
+	@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
+	$(MAKE) -C mxml libmxml.a
+
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml

[... 34254 lines stripped ...]

More information about the asterisk-commits mailing list