[asterisk-commits] russell: branch bbryant/sip-tcptls r89485 - in /team/bbryant/sip-tcptls: ./ a...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Nov 21 12:07:11 CST 2007
Author: russell
Date: Wed Nov 21 12:07:09 2007
New Revision: 89485
URL: http://svn.digium.com/view/asterisk?view=rev&rev=89485
Log:
sync with trunk
Added:
team/bbryant/sip-tcptls/configs/cdr_sqlite3_custom.conf.sample
- copied unchanged from r89484, trunk/configs/cdr_sqlite3_custom.conf.sample
team/bbryant/sip-tcptls/configs/usbradio.conf.sample
- copied unchanged from r89484, trunk/configs/usbradio.conf.sample
team/bbryant/sip-tcptls/contrib/utils/eagi_proxy.c
- copied unchanged from r89484, trunk/contrib/utils/eagi_proxy.c
team/bbryant/sip-tcptls/funcs/func_sysinfo.c
- copied unchanged from r89484, trunk/funcs/func_sysinfo.c
team/bbryant/sip-tcptls/include/asterisk/_private.h
- copied unchanged from r89484, trunk/include/asterisk/_private.h
team/bbryant/sip-tcptls/include/asterisk/hashtab.h
- copied unchanged from r89484, trunk/include/asterisk/hashtab.h
team/bbryant/sip-tcptls/include/asterisk/network.h
- copied unchanged from r89484, trunk/include/asterisk/network.h
team/bbryant/sip-tcptls/main/cygload.c
- copied unchanged from r89484, trunk/main/cygload.c
team/bbryant/sip-tcptls/main/hashtab.c
- copied unchanged from r89484, trunk/main/hashtab.c
team/bbryant/sip-tcptls/utils/hashtest.c
- copied unchanged from r89484, trunk/utils/hashtest.c
Removed:
team/bbryant/sip-tcptls/channels/gentone-ulaw.c
team/bbryant/sip-tcptls/configs/cdr_sqlite3_custom.conf
Modified:
team/bbryant/sip-tcptls/ (props changed)
team/bbryant/sip-tcptls/CHANGES
team/bbryant/sip-tcptls/Makefile
team/bbryant/sip-tcptls/Makefile.moddir_rules
team/bbryant/sip-tcptls/Makefile.rules
team/bbryant/sip-tcptls/UPGRADE.txt
team/bbryant/sip-tcptls/acinclude.m4
team/bbryant/sip-tcptls/agi/Makefile
team/bbryant/sip-tcptls/agi/eagi-test.c
team/bbryant/sip-tcptls/apps/Makefile
team/bbryant/sip-tcptls/apps/app_adsiprog.c
team/bbryant/sip-tcptls/apps/app_alarmreceiver.c
team/bbryant/sip-tcptls/apps/app_amd.c
team/bbryant/sip-tcptls/apps/app_authenticate.c
team/bbryant/sip-tcptls/apps/app_cdr.c
team/bbryant/sip-tcptls/apps/app_chanisavail.c
team/bbryant/sip-tcptls/apps/app_channelredirect.c
team/bbryant/sip-tcptls/apps/app_chanspy.c
team/bbryant/sip-tcptls/apps/app_controlplayback.c
team/bbryant/sip-tcptls/apps/app_db.c
team/bbryant/sip-tcptls/apps/app_dial.c
team/bbryant/sip-tcptls/apps/app_dictate.c
team/bbryant/sip-tcptls/apps/app_directed_pickup.c
team/bbryant/sip-tcptls/apps/app_directory.c
team/bbryant/sip-tcptls/apps/app_disa.c
team/bbryant/sip-tcptls/apps/app_dumpchan.c
team/bbryant/sip-tcptls/apps/app_echo.c
team/bbryant/sip-tcptls/apps/app_exec.c
team/bbryant/sip-tcptls/apps/app_externalivr.c
team/bbryant/sip-tcptls/apps/app_festival.c
team/bbryant/sip-tcptls/apps/app_flash.c
team/bbryant/sip-tcptls/apps/app_followme.c
team/bbryant/sip-tcptls/apps/app_forkcdr.c
team/bbryant/sip-tcptls/apps/app_getcpeid.c
team/bbryant/sip-tcptls/apps/app_ices.c
team/bbryant/sip-tcptls/apps/app_image.c
team/bbryant/sip-tcptls/apps/app_ivrdemo.c
team/bbryant/sip-tcptls/apps/app_macro.c
team/bbryant/sip-tcptls/apps/app_meetme.c
team/bbryant/sip-tcptls/apps/app_milliwatt.c
team/bbryant/sip-tcptls/apps/app_minivm.c
team/bbryant/sip-tcptls/apps/app_mixmonitor.c
team/bbryant/sip-tcptls/apps/app_morsecode.c
team/bbryant/sip-tcptls/apps/app_mp3.c
team/bbryant/sip-tcptls/apps/app_nbscat.c
team/bbryant/sip-tcptls/apps/app_osplookup.c
team/bbryant/sip-tcptls/apps/app_page.c
team/bbryant/sip-tcptls/apps/app_parkandannounce.c
team/bbryant/sip-tcptls/apps/app_playback.c
team/bbryant/sip-tcptls/apps/app_privacy.c
team/bbryant/sip-tcptls/apps/app_queue.c
team/bbryant/sip-tcptls/apps/app_read.c
team/bbryant/sip-tcptls/apps/app_readexten.c
team/bbryant/sip-tcptls/apps/app_readfile.c
team/bbryant/sip-tcptls/apps/app_record.c
team/bbryant/sip-tcptls/apps/app_rpt.c
team/bbryant/sip-tcptls/apps/app_sayunixtime.c
team/bbryant/sip-tcptls/apps/app_senddtmf.c
team/bbryant/sip-tcptls/apps/app_sendtext.c
team/bbryant/sip-tcptls/apps/app_setcallerid.c
team/bbryant/sip-tcptls/apps/app_skel.c
team/bbryant/sip-tcptls/apps/app_sms.c
team/bbryant/sip-tcptls/apps/app_softhangup.c
team/bbryant/sip-tcptls/apps/app_speech_utils.c
team/bbryant/sip-tcptls/apps/app_stack.c
team/bbryant/sip-tcptls/apps/app_system.c
team/bbryant/sip-tcptls/apps/app_talkdetect.c
team/bbryant/sip-tcptls/apps/app_test.c
team/bbryant/sip-tcptls/apps/app_transfer.c
team/bbryant/sip-tcptls/apps/app_url.c
team/bbryant/sip-tcptls/apps/app_userevent.c
team/bbryant/sip-tcptls/apps/app_verbose.c
team/bbryant/sip-tcptls/apps/app_voicemail.c
team/bbryant/sip-tcptls/apps/app_waitforring.c
team/bbryant/sip-tcptls/apps/app_waitforsilence.c
team/bbryant/sip-tcptls/apps/app_while.c
team/bbryant/sip-tcptls/apps/app_zapateller.c
team/bbryant/sip-tcptls/apps/app_zapbarge.c
team/bbryant/sip-tcptls/apps/app_zapras.c
team/bbryant/sip-tcptls/apps/app_zapscan.c
team/bbryant/sip-tcptls/build_tools/make_buildopts_h
team/bbryant/sip-tcptls/build_tools/strip_nonapi
team/bbryant/sip-tcptls/cdr/cdr_adaptive_odbc.c
team/bbryant/sip-tcptls/cdr/cdr_csv.c
team/bbryant/sip-tcptls/cdr/cdr_custom.c
team/bbryant/sip-tcptls/cdr/cdr_manager.c
team/bbryant/sip-tcptls/cdr/cdr_odbc.c
team/bbryant/sip-tcptls/cdr/cdr_pgsql.c
team/bbryant/sip-tcptls/cdr/cdr_radius.c
team/bbryant/sip-tcptls/cdr/cdr_sqlite.c
team/bbryant/sip-tcptls/cdr/cdr_sqlite3_custom.c
team/bbryant/sip-tcptls/cdr/cdr_tds.c
team/bbryant/sip-tcptls/channels/Makefile
team/bbryant/sip-tcptls/channels/chan_agent.c
team/bbryant/sip-tcptls/channels/chan_alsa.c
team/bbryant/sip-tcptls/channels/chan_features.c
team/bbryant/sip-tcptls/channels/chan_gtalk.c
team/bbryant/sip-tcptls/channels/chan_h323.c
team/bbryant/sip-tcptls/channels/chan_iax2.c
team/bbryant/sip-tcptls/channels/chan_jingle.c
team/bbryant/sip-tcptls/channels/chan_local.c
team/bbryant/sip-tcptls/channels/chan_mgcp.c
team/bbryant/sip-tcptls/channels/chan_misdn.c
team/bbryant/sip-tcptls/channels/chan_nbs.c
team/bbryant/sip-tcptls/channels/chan_oss.c
team/bbryant/sip-tcptls/channels/chan_phone.c
team/bbryant/sip-tcptls/channels/chan_sip.c
team/bbryant/sip-tcptls/channels/chan_skinny.c
team/bbryant/sip-tcptls/channels/chan_unistim.c
team/bbryant/sip-tcptls/channels/chan_usbradio.c
team/bbryant/sip-tcptls/channels/chan_vpb.cc
team/bbryant/sip-tcptls/channels/chan_zap.c
team/bbryant/sip-tcptls/channels/h323/ast_h323.cxx
team/bbryant/sip-tcptls/channels/iax2-parser.c
team/bbryant/sip-tcptls/channels/iax2-provision.c
team/bbryant/sip-tcptls/channels/misdn/chan_misdn_config.h
team/bbryant/sip-tcptls/channels/misdn/isdn_lib.c
team/bbryant/sip-tcptls/channels/misdn/isdn_lib.h
team/bbryant/sip-tcptls/channels/misdn/isdn_lib_intern.h
team/bbryant/sip-tcptls/channels/misdn/isdn_msg_parser.c
team/bbryant/sip-tcptls/channels/misdn_config.c
team/bbryant/sip-tcptls/codecs/codec_a_mu.c
team/bbryant/sip-tcptls/codecs/codec_adpcm.c
team/bbryant/sip-tcptls/codecs/codec_alaw.c
team/bbryant/sip-tcptls/codecs/codec_g722.c
team/bbryant/sip-tcptls/codecs/codec_g726.c
team/bbryant/sip-tcptls/codecs/codec_gsm.c
team/bbryant/sip-tcptls/codecs/codec_ilbc.c
team/bbryant/sip-tcptls/codecs/codec_lpc10.c
team/bbryant/sip-tcptls/codecs/codec_speex.c
team/bbryant/sip-tcptls/codecs/codec_ulaw.c
team/bbryant/sip-tcptls/codecs/codec_zap.c
team/bbryant/sip-tcptls/configs/cdr_adaptive_odbc.conf.sample
team/bbryant/sip-tcptls/configs/extensions.ael.sample
team/bbryant/sip-tcptls/configs/misdn.conf.sample
team/bbryant/sip-tcptls/configs/queues.conf.sample
team/bbryant/sip-tcptls/configs/res_odbc.conf.sample
team/bbryant/sip-tcptls/configs/sip.conf.sample
team/bbryant/sip-tcptls/configs/zapata.conf.sample
team/bbryant/sip-tcptls/configure
team/bbryant/sip-tcptls/configure.ac
team/bbryant/sip-tcptls/doc/tex/channelvariables.tex
team/bbryant/sip-tcptls/doc/tex/imapstorage.tex
team/bbryant/sip-tcptls/doc/tex/localchannel.tex
team/bbryant/sip-tcptls/doc/tex/queues-with-callback-members.tex
team/bbryant/sip-tcptls/doc/valgrind.txt
team/bbryant/sip-tcptls/formats/format_g723.c
team/bbryant/sip-tcptls/formats/format_g726.c
team/bbryant/sip-tcptls/formats/format_g729.c
team/bbryant/sip-tcptls/formats/format_gsm.c
team/bbryant/sip-tcptls/formats/format_h263.c
team/bbryant/sip-tcptls/formats/format_h264.c
team/bbryant/sip-tcptls/formats/format_ilbc.c
team/bbryant/sip-tcptls/formats/format_jpeg.c
team/bbryant/sip-tcptls/formats/format_ogg_vorbis.c
team/bbryant/sip-tcptls/formats/format_pcm.c
team/bbryant/sip-tcptls/formats/format_sln.c
team/bbryant/sip-tcptls/formats/format_vox.c
team/bbryant/sip-tcptls/formats/format_wav.c
team/bbryant/sip-tcptls/formats/format_wav_gsm.c
team/bbryant/sip-tcptls/funcs/func_base64.c
team/bbryant/sip-tcptls/funcs/func_blacklist.c
team/bbryant/sip-tcptls/funcs/func_callerid.c
team/bbryant/sip-tcptls/funcs/func_cdr.c
team/bbryant/sip-tcptls/funcs/func_channel.c
team/bbryant/sip-tcptls/funcs/func_curl.c
team/bbryant/sip-tcptls/funcs/func_cut.c
team/bbryant/sip-tcptls/funcs/func_db.c
team/bbryant/sip-tcptls/funcs/func_devstate.c
team/bbryant/sip-tcptls/funcs/func_dialgroup.c
team/bbryant/sip-tcptls/funcs/func_enum.c
team/bbryant/sip-tcptls/funcs/func_env.c
team/bbryant/sip-tcptls/funcs/func_extstate.c
team/bbryant/sip-tcptls/funcs/func_global.c
team/bbryant/sip-tcptls/funcs/func_groupcount.c
team/bbryant/sip-tcptls/funcs/func_iconv.c
team/bbryant/sip-tcptls/funcs/func_lock.c
team/bbryant/sip-tcptls/funcs/func_logic.c
team/bbryant/sip-tcptls/funcs/func_math.c
team/bbryant/sip-tcptls/funcs/func_md5.c
team/bbryant/sip-tcptls/funcs/func_module.c
team/bbryant/sip-tcptls/funcs/func_odbc.c
team/bbryant/sip-tcptls/funcs/func_rand.c
team/bbryant/sip-tcptls/funcs/func_realtime.c
team/bbryant/sip-tcptls/funcs/func_sha1.c
team/bbryant/sip-tcptls/funcs/func_shell.c
team/bbryant/sip-tcptls/funcs/func_strings.c
team/bbryant/sip-tcptls/funcs/func_timeout.c
team/bbryant/sip-tcptls/funcs/func_uri.c
team/bbryant/sip-tcptls/funcs/func_version.c
team/bbryant/sip-tcptls/funcs/func_vmcount.c
team/bbryant/sip-tcptls/funcs/func_volume.c
team/bbryant/sip-tcptls/include/asterisk.h
team/bbryant/sip-tcptls/include/asterisk/abstract_jb.h
team/bbryant/sip-tcptls/include/asterisk/acl.h
team/bbryant/sip-tcptls/include/asterisk/ael_structs.h
team/bbryant/sip-tcptls/include/asterisk/agi.h
team/bbryant/sip-tcptls/include/asterisk/astmm.h
team/bbryant/sip-tcptls/include/asterisk/astobj.h
team/bbryant/sip-tcptls/include/asterisk/autoconfig.h.in
team/bbryant/sip-tcptls/include/asterisk/channel.h
team/bbryant/sip-tcptls/include/asterisk/cli.h
team/bbryant/sip-tcptls/include/asterisk/compat.h
team/bbryant/sip-tcptls/include/asterisk/config.h
team/bbryant/sip-tcptls/include/asterisk/dnsmgr.h
team/bbryant/sip-tcptls/include/asterisk/endian.h
team/bbryant/sip-tcptls/include/asterisk/file.h
team/bbryant/sip-tcptls/include/asterisk/frame.h
team/bbryant/sip-tcptls/include/asterisk/io.h
team/bbryant/sip-tcptls/include/asterisk/jabber.h
team/bbryant/sip-tcptls/include/asterisk/linkedlists.h
team/bbryant/sip-tcptls/include/asterisk/lock.h
team/bbryant/sip-tcptls/include/asterisk/logger.h
team/bbryant/sip-tcptls/include/asterisk/manager.h
team/bbryant/sip-tcptls/include/asterisk/md5.h
team/bbryant/sip-tcptls/include/asterisk/module.h
team/bbryant/sip-tcptls/include/asterisk/netsock.h
team/bbryant/sip-tcptls/include/asterisk/paths.h
team/bbryant/sip-tcptls/include/asterisk/pbx.h
team/bbryant/sip-tcptls/include/asterisk/plc.h
team/bbryant/sip-tcptls/include/asterisk/rtp.h
team/bbryant/sip-tcptls/include/asterisk/sha1.h
team/bbryant/sip-tcptls/include/asterisk/slinfactory.h
team/bbryant/sip-tcptls/include/asterisk/stringfields.h
team/bbryant/sip-tcptls/include/asterisk/strings.h
team/bbryant/sip-tcptls/include/asterisk/tdd.h
team/bbryant/sip-tcptls/include/asterisk/time.h
team/bbryant/sip-tcptls/include/asterisk/translate.h
team/bbryant/sip-tcptls/include/asterisk/udptl.h
team/bbryant/sip-tcptls/include/asterisk/utils.h
team/bbryant/sip-tcptls/main/Makefile
team/bbryant/sip-tcptls/main/abstract_jb.c
team/bbryant/sip-tcptls/main/acl.c
team/bbryant/sip-tcptls/main/adsistub.c
team/bbryant/sip-tcptls/main/alaw.c
team/bbryant/sip-tcptls/main/app.c
team/bbryant/sip-tcptls/main/ast_expr2.fl
team/bbryant/sip-tcptls/main/ast_expr2f.c
team/bbryant/sip-tcptls/main/asterisk.c
team/bbryant/sip-tcptls/main/astmm.c
team/bbryant/sip-tcptls/main/astobj2.c
team/bbryant/sip-tcptls/main/audiohook.c
team/bbryant/sip-tcptls/main/autoservice.c
team/bbryant/sip-tcptls/main/callerid.c
team/bbryant/sip-tcptls/main/cdr.c
team/bbryant/sip-tcptls/main/channel.c
team/bbryant/sip-tcptls/main/chanvars.c
team/bbryant/sip-tcptls/main/cli.c
team/bbryant/sip-tcptls/main/config.c
team/bbryant/sip-tcptls/main/cryptostub.c
team/bbryant/sip-tcptls/main/db.c
team/bbryant/sip-tcptls/main/devicestate.c
team/bbryant/sip-tcptls/main/dial.c
team/bbryant/sip-tcptls/main/dlfcn.c
team/bbryant/sip-tcptls/main/dns.c
team/bbryant/sip-tcptls/main/dnsmgr.c
team/bbryant/sip-tcptls/main/dsp.c
team/bbryant/sip-tcptls/main/enum.c
team/bbryant/sip-tcptls/main/event.c
team/bbryant/sip-tcptls/main/file.c
team/bbryant/sip-tcptls/main/fixedjitterbuf.c
team/bbryant/sip-tcptls/main/frame.c
team/bbryant/sip-tcptls/main/fskmodem.c
team/bbryant/sip-tcptls/main/http.c
team/bbryant/sip-tcptls/main/image.c
team/bbryant/sip-tcptls/main/indications.c
team/bbryant/sip-tcptls/main/io.c
team/bbryant/sip-tcptls/main/jitterbuf.c
team/bbryant/sip-tcptls/main/loader.c
team/bbryant/sip-tcptls/main/logger.c
team/bbryant/sip-tcptls/main/manager.c
team/bbryant/sip-tcptls/main/md5.c
team/bbryant/sip-tcptls/main/minimime/mm.h
team/bbryant/sip-tcptls/main/netsock.c
team/bbryant/sip-tcptls/main/pbx.c
team/bbryant/sip-tcptls/main/plc.c
team/bbryant/sip-tcptls/main/privacy.c
team/bbryant/sip-tcptls/main/rtp.c
team/bbryant/sip-tcptls/main/say.c
team/bbryant/sip-tcptls/main/sched.c
team/bbryant/sip-tcptls/main/sha1.c
team/bbryant/sip-tcptls/main/slinfactory.c
team/bbryant/sip-tcptls/main/srv.c
team/bbryant/sip-tcptls/main/stdtime/localtime.c
team/bbryant/sip-tcptls/main/strcompat.c
team/bbryant/sip-tcptls/main/tdd.c
team/bbryant/sip-tcptls/main/term.c
team/bbryant/sip-tcptls/main/threadstorage.c
team/bbryant/sip-tcptls/main/translate.c
team/bbryant/sip-tcptls/main/udptl.c
team/bbryant/sip-tcptls/main/ulaw.c
team/bbryant/sip-tcptls/main/utils.c
team/bbryant/sip-tcptls/makeopts.in
team/bbryant/sip-tcptls/pbx/Makefile
team/bbryant/sip-tcptls/pbx/dundi-parser.c
team/bbryant/sip-tcptls/pbx/dundi-parser.h
team/bbryant/sip-tcptls/pbx/pbx_ael.c
team/bbryant/sip-tcptls/pbx/pbx_config.c
team/bbryant/sip-tcptls/pbx/pbx_dundi.c
team/bbryant/sip-tcptls/pbx/pbx_gtkconsole.c
team/bbryant/sip-tcptls/pbx/pbx_loopback.c
team/bbryant/sip-tcptls/pbx/pbx_lua.c
team/bbryant/sip-tcptls/pbx/pbx_realtime.c
team/bbryant/sip-tcptls/pbx/pbx_spool.c
team/bbryant/sip-tcptls/res/Makefile
team/bbryant/sip-tcptls/res/ael/pval.c
team/bbryant/sip-tcptls/res/res_adsi.c
team/bbryant/sip-tcptls/res/res_ael_share.c
team/bbryant/sip-tcptls/res/res_agi.c
team/bbryant/sip-tcptls/res/res_clioriginate.c
team/bbryant/sip-tcptls/res/res_config_odbc.c
team/bbryant/sip-tcptls/res/res_config_pgsql.c
team/bbryant/sip-tcptls/res/res_config_sqlite.c
team/bbryant/sip-tcptls/res/res_convert.c
team/bbryant/sip-tcptls/res/res_crypto.c
team/bbryant/sip-tcptls/res/res_features.c
team/bbryant/sip-tcptls/res/res_indications.c
team/bbryant/sip-tcptls/res/res_jabber.c
team/bbryant/sip-tcptls/res/res_limit.c
team/bbryant/sip-tcptls/res/res_monitor.c
team/bbryant/sip-tcptls/res/res_musiconhold.c
team/bbryant/sip-tcptls/res/res_odbc.c
team/bbryant/sip-tcptls/res/res_realtime.c
team/bbryant/sip-tcptls/res/res_smdi.c
team/bbryant/sip-tcptls/res/res_snmp.c
team/bbryant/sip-tcptls/res/res_speech.c
team/bbryant/sip-tcptls/utils/Makefile
team/bbryant/sip-tcptls/utils/ael_main.c
team/bbryant/sip-tcptls/utils/astman.c
team/bbryant/sip-tcptls/utils/check_expr.c
team/bbryant/sip-tcptls/utils/conf2ael.c
team/bbryant/sip-tcptls/utils/extconf.c
team/bbryant/sip-tcptls/utils/hashtest2.c
team/bbryant/sip-tcptls/utils/smsq.c
Propchange: team/bbryant/sip-tcptls/
------------------------------------------------------------------------------
automerge = *
Propchange: team/bbryant/sip-tcptls/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/bbryant/sip-tcptls/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/bbryant/sip-tcptls/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 21 12:07:09 2007
@@ -1,1 +1,1 @@
-/trunk:1-88996
+/trunk:1-89484
Modified: team/bbryant/sip-tcptls/CHANGES
URL: http://svn.digium.com/view/asterisk/team/bbryant/sip-tcptls/CHANGES?view=diff&rev=89485&r1=89484&r2=89485
==============================================================================
--- team/bbryant/sip-tcptls/CHANGES (original)
+++ team/bbryant/sip-tcptls/CHANGES Wed Nov 21 12:07:09 2007
@@ -44,6 +44,7 @@
of devices or the name associated with a hint.
* Added EXTENSION_STATE() dialplan function which allows retrieving the state
of any extension.
+ * Added SYSINFO() dialplan function which allows retrieval of system information
CLI Changes
-----------
@@ -67,8 +68,9 @@
since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
* The "localmask" setting was removed in version 1.2 and the reminder about it
being removed is now also removed.
- * A new option "busy-level" for setting a level of calls where asterisk reports
- a device as busy, to separate it from call-limit
+ * A new option "busylevel" for setting a level of calls where asterisk reports
+ a device as busy, to separate it from call-limit. This value is also added
+ to the SIP_PEER dialplan function.
* A new realtime family called "sipregs" is now supported to store SIP registration
data. If this family is defined, "sippeers" will be used for configuration and
"sipregs" for registrations. If it's not defined, "sippeers" will be used for
@@ -166,6 +168,7 @@
queue log.
* Added ability for non-realtime queues to have realtime members
* Added the "linear" strategy to queues.
+ * Added the "wrandom" strategy to queues.
MeetMe Changes
--------------
@@ -185,6 +188,16 @@
the schedule start time, or to allow the caller to join the conference early.
Also included is optional support for limiting the number of callers per
RealTime conference.
+ * Added the S() and L() options to the MeetMe application. These are pretty
+ much identical to the S() and L() options to Dial(). They let you set
+ timeouts for the conference, as well as have warning sounds played to
+ let the caller know how much time is left, and when it is running out.
+ * Added the ability to do "meetme concise" with the "meetme" CLI command.
+ This extends the concise capabilities of this CLI command to include
+ listing all conferences, instead of an addition to the other sub commands
+ for the "meetme" command.
+ * Added the ability to specify the music on hold class used to play into the
+ conference when there is only one member and the M option is used.
Music On Hold Changes
---------------------
@@ -246,6 +259,9 @@
features.conf. This means that features can be written a single time, and
then mapped into groups of features for different key mappings or easier
access control.
+ * Updated the ParkedCall application to allow you to not specify a parking
+ extension. If you don't specify a parking space to pick up, it will grab
+ the first one available.
Language Support Changes
------------------------
@@ -307,4 +323,8 @@
configs/extensions.lua.sample for examples of how to do this.
* Added a new channel driver, chan_unistim. See doc/unistim.txt and
configs/unistim.conf.sample for details. This new channel driver allows
- you to use Nortel i2002, i2004, and i2050 phones with Asterisk.
+ you to use Nortel i2002, i2004, and i2050 phones with Asterisk.
+ * Enhanced "agi debug" to print the channel name as a prefix to the debug
+ output to make debugging on busy systems much easier.
+ * Added the ability to specify a music on hold class to play instead of ringing
+ for the SLATrunk application.
Modified: team/bbryant/sip-tcptls/Makefile
URL: http://svn.digium.com/view/asterisk/team/bbryant/sip-tcptls/Makefile?view=diff&rev=89485&r1=89484&r2=89485
==============================================================================
--- team/bbryant/sip-tcptls/Makefile (original)
+++ team/bbryant/sip-tcptls/Makefile Wed Nov 21 12:07:09 2007
@@ -251,7 +251,7 @@
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
-MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs main res
OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -293,6 +293,9 @@
mK=" make"
endif
+# comment to print directories during submakes
+PRINT_DIR?= --no-print-directory
+
all: _all
@echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, and +"
@@ -314,38 +317,46 @@
menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
- @echo "EMBED_LDSCRIPTS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+ @echo "EMBED_LDSCRIPTS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LDFLAGS):
- @echo "EMBED_LDFLAGS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+ @echo "EMBED_LDFLAGS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LIBS):
- @echo "EMBED_LIBS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+ @echo "EMBED_LIBS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
makeopts.embed_rules: menuselect.makeopts
@echo "Generating embedded module rules ..."
@rm -f $@
- @$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDSCRIPT)
- @$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDFLAGS)
- @$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LIBS)
+ @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
+ @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)
+ @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS)
$(SUBDIRS): include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
-# ensure that all module subdirectories are processed before 'main' during
-# a parallel build, since if there are modules selected to be embedded the
-# directories containing them must be completed before the main Asterisk
-# binary can be built
+ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
+ # Non-windows:
+ # ensure that all module subdirectories are processed before 'main' during
+ # a parallel build, since if there are modules selected to be embedded the
+ # directories containing them must be completed before the main Asterisk
+ # binary can be built
main: $(filter-out main,$(MOD_SUBDIRS))
+else
+ # Windows: we need to build main (i.e. the asterisk dll) first,
+ # followed by res, followed by the other directories, because
+ # dll symbols must be resolved during linking and not at runtime.
+D1:= $(filter-out main,$(MOD_SUBDIRS))
+D1:= $(filter-out res,$(D1))
+
+$(D1): res
+res: main
+endif
$(MOD_SUBDIRS):
- @echo " [enter MOD_SUBDIR $@/]"
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
- @echo " [exit MOD_SUBDIR $@/]"
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- @echo " [enter SUBDIR $@/]"
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
- @echo " [exit SUBDIR $@/]"
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@@ -376,10 +387,10 @@
@rm -f $@.tmp
$(SUBDIRS_CLEAN):
- @$(MAKE) --no-print-directory -C $(@:-clean=) clean
+ @$(MAKE) $(PRINT_DIR) -C $(@:-clean=) clean
$(SUBDIRS_DIST_CLEAN):
- @$(MAKE) --no-print-directory -C $(@:-dist-clean=) dist-clean
+ @$(MAKE) $(PRINT_DIR) -C $(@:-dist-clean=) dist-clean
clean: $(SUBDIRS_CLEAN)
rm -f defaults.h
@@ -672,11 +683,11 @@
if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
elif [ -f /etc/debian_version ]; then \
$(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk $(DESTDIR)/etc/init.d/asterisk; \
- if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
+ if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 50 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
elif [ -f /etc/gentoo-release ]; then \
$(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \
if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \
- elif [ -f /etc/mandrake-release ]; then \
+ elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ]; then \
$(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
@@ -702,7 +713,7 @@
@cmp -s .cleancount .lastclean || $(MAKE) clean
$(SUBDIRS_UNINSTALL):
- @$(MAKE) --no-print-directory -C $(@:-uninstall=) uninstall
+ @$(MAKE) $(PRINT_DIR) -C $(@:-uninstall=) uninstall
_uninstall: $(SUBDIRS_UNINSTALL)
rm -f $(DESTDIR)$(MODULES_DIR)/*
@@ -749,11 +760,15 @@
gmenuselect: menuselect/gmenuselect menuselect-tree
- at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
-menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
+menuselect/menuselect: menuselect/makeopts
+ echo "doing menuselect with $(HOST_CC)"
@CC="$(HOST_CC)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
-menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
- @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
+menuselect/gmenuselect: menuselect/makeopts
+ @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect gmenuselect CONFIGURE_SILENT="--silent"
+
+menuselect/makeopts:
+ @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect makeopts CONFIGURE_SILENT="--silent"
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml configure
@echo "Generating input for menuselect ..."
Modified: team/bbryant/sip-tcptls/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/bbryant/sip-tcptls/Makefile.moddir_rules?view=diff&rev=89485&r1=89484&r2=89485
==============================================================================
--- team/bbryant/sip-tcptls/Makefile.moddir_rules (original)
+++ team/bbryant/sip-tcptls/Makefile.moddir_rules Wed Nov 21 12:07:09 2007
@@ -43,8 +43,12 @@
$(addsuffix .oo,$(CC_MODS)) $(addsuffix .o,$(C_MODS)): \
ASTCFLAGS+= -DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
+ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
+ # don't define -fPIC on mingw32 and cygwin, it is the default
+ $(LOADABLE_MODS:%=%.so): ASTCFLAGS+=-fPIC
+endif
+
# For loadable modules, pass _LIB and _LDFLAGS from menuselect.
-$(LOADABLE_MODS:%=%.so): ASTCFLAGS+=-fPIC
$(LOADABLE_MODS:%=%.so): LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LIB))
$(LOADABLE_MODS:%=%.so): ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
@@ -54,12 +58,17 @@
$(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo
modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS)))
-modules.link: $(addsuffix .eoo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
.PHONY: clean uninstall _all
ifneq ($(LOADABLE_MODS),)
_all: $(LOADABLE_MODS:%=%.so)
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+ # linker options and extra libraries for cygwin
+ SOLINK=-Wl,--out-implib=lib$@.a -shared
+ LIBS+=-L../main -lasterisk -L../res $($@_LIBS)
+ # additional libraries in res/
+endif
endif
ifneq ($(EMBEDDED_MODS),)
@@ -80,11 +89,11 @@
modules.link:
@rm -f $@
- @for file in $(patsubst %,$(SUBDIR)/%,$(filter %.eo %.eoo,$^)); do echo "INPUT (../$${file})" >> $@; done
- @for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo %.eoo,$^)); do echo "INPUT (../$${file})" >> $@; done
+ @for file in $(patsubst %,$(SUBDIR)/%,$(filter %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done
+ @for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done
clean::
- rm -f *.so *.o *.oo *.eo *.eoo
+ rm -f *.so *.o *.oo *.eo
rm -f .*.o.d .*.oo.d
rm -f *.s *.i
rm -f modules.link
Modified: team/bbryant/sip-tcptls/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/bbryant/sip-tcptls/Makefile.rules?view=diff&rev=89485&r1=89484&r2=89485
==============================================================================
--- team/bbryant/sip-tcptls/Makefile.rules (original)
+++ team/bbryant/sip-tcptls/Makefile.rules Wed Nov 21 12:07:09 2007
@@ -85,7 +85,7 @@
$(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<
$(CMD_PREFIX) rm -f .$@.ld
-%.eoo: %.o
+%.eo: %.oo
$(ECHO_PREFIX) echo " [EMBED] $< -> $@"
$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_eo_script $* > .$@.ld
$(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<
Modified: team/bbryant/sip-tcptls/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/bbryant/sip-tcptls/UPGRADE.txt?view=diff&rev=89485&r1=89484&r2=89485
==============================================================================
--- team/bbryant/sip-tcptls/UPGRADE.txt (original)
+++ team/bbryant/sip-tcptls/UPGRADE.txt Wed Nov 21 12:07:09 2007
@@ -98,7 +98,7 @@
* format_wav: The GAIN preprocessor definition and source code that used it
is removed. This change was made in response to user complaints of
- choppiness or the clipping of loud signal peaks. To increasing the volume
+ choppiness or the clipping of loud signal peaks. To increase the volume
of voicemail messages, use the 'volgain' option in voicemail.conf
Channel Drivers:
Modified: team/bbryant/sip-tcptls/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/bbryant/sip-tcptls/acinclude.m4?view=diff&rev=89485&r1=89484&r2=89485
==============================================================================
--- team/bbryant/sip-tcptls/acinclude.m4 (original)
+++ team/bbryant/sip-tcptls/acinclude.m4 Wed Nov 21 12:07:09 2007
@@ -1,3 +1,7 @@
+# Various support functions for configure.ac in asterisk
+#
+
+# Helper function to check for gcc attributes.
# AST_GCC_ATTRIBUTE([attribute name])
AC_DEFUN([AST_GCC_ATTRIBUTE],
@@ -11,35 +15,43 @@
AC_MSG_RESULT(no))
])
-# AST_EXT_LIB_SETUP([package symbol name], [package friendly name], [package option name], [additional help text])
+# Helper function to setup variables for a package.
+# $1 -> the package name. Used in configure.ac and also as a prefix
+# for the variables ($1_DIR, $1_INCLUDE, $1_LIB) in makeopts
+# $3 -> option name, used in --with-$3 or --without-$3 when calling configure.
+# $2 and $4 are just text describing the package (short and long form)
+
+# AST_EXT_LIB_SETUP([package], [short description], [configure option name], [long description])
AC_DEFUN([AST_EXT_LIB_SETUP],
[
-$1_DESCRIP="$2"
-$1_OPTION="$3"
-AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH $4]),[
-case ${withval} in
- n|no)
- USE_$1=no
- ;;
- y|ye|yes)
- ac_mandatory_list="${ac_mandatory_list} $1"
- ;;
- *)
- $1_DIR="${withval}"
- ac_mandatory_list="${ac_mandatory_list} $1"
- ;;
-esac
-])
-PBX_$1=0
-AC_SUBST([$1_LIB])
-AC_SUBST([$1_INCLUDE])
-AC_SUBST([$1_DIR])
-AC_SUBST([PBX_$1])
+ $1_DESCRIP="$2"
+ $1_OPTION="$3"
+ AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH $4]),
+ [
+ case ${withval} in
+ n|no)
+ USE_$1=no
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} $1"
+ ;;
+ *)
+ $1_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} $1"
+ ;;
+ esac
+ ])
+ PBX_$1=0
+ AC_SUBST([$1_LIB])
+ AC_SUBST([$1_INCLUDE])
+ AC_SUBST([$1_DIR])
+ AC_SUBST([PBX_$1])
])
# Check whether any of the mandatory modules are not present, and
-# print error messages in case.
+# print error messages in case. The mandatory list is built using
+# --with-* arguments when invoking configure.
AC_DEFUN([AST_CHECK_MANDATORY],
[
@@ -61,16 +73,22 @@
AC_MSG_RESULT(ok)
])
-#-- The following two tests are only performed if PBX_$1 != 1,
-# so you can use multiple tests and stop at the first matching one.
-# On success, set PBX_$1 = 1, and also #define HAVE_$1 1
-# and #define HAVE_$1_VERSION ${last_argument} so you can tell which
-# test succeeded.
-# They should be called after AST_EXT_LIB_SETUP($1, ...)
+# The next three functions check for the availability of a given package.
+# AST_C_DEFINE_CHECK looks for the presence of a #define in a header file,
+# AST_EXT_LIB_CHECK looks for a symbol in a given library, or at least
+# for the presence of a header file.
+# AST_EXT_TOOL_CHECK looks for a symbol in using $1-config to determine CFLAGS and LIBS
+#
+# They are only run if PBX_$1 != 1 (where $1 is the package),
+# so you can call them multiple times and stop at the first matching one.
+# On success, they both set PBX_$1 = 1, set $1_INCLUDE and $1_LIB as applicable,
+# and also #define HAVE_$1 1 and #define HAVE_$1_VERSION ${last_argument}
+# in autoconfig.h so you can tell which test succeeded.
+# They should be called after AST_EXT_LIB_SETUP($1, ...)
# Check if a given macro is defined in a certain header.
-# AST_C_DEFINE_CHECK([package symbol name], [macro name], [header file], [version])
+# AST_C_DEFINE_CHECK([package], [macro name], [header file], [version])
AC_DEFUN([AST_C_DEFINE_CHECK],
[
if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
@@ -99,11 +117,13 @@
# in a library, or, if no function is supplied, only check for the
# existence of the header files.
-# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data], [version])
+# AST_EXT_LIB_CHECK([package], [library], [function], [header],
+# [extra libs], [extra cflags], [version])
AC_DEFUN([AST_EXT_LIB_CHECK],
[
if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
pbxlibdir=""
+ # if --with-$1=DIR has been specified, use it.
if test "x${$1_DIR}" != "x"; then
if test -d ${$1_DIR}/lib; then
pbxlibdir="-L${$1_DIR}/lib"
@@ -118,22 +138,21 @@
AC_CHECK_LIB([$2], [${pbxfuncname}], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], ${pbxlibdir} $5)
fi
+ # now check for the header.
if test "${AST_$1_FOUND}" = "yes"; then
- $1_LIB="-l$2 $5"
- $1_HEADER_FOUND="1"
+ $1_LIB="${pbxlibdir} -l$2 $5"
+ # if --with-$1=DIR has been specified, use it.
if test "x${$1_DIR}" != "x"; then
- $1_LIB="${pbxlibdir} ${$1_LIB}"
$1_INCLUDE="-I${$1_DIR}/include"
- saved_cppflags="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} -I${$1_DIR}/include"
- if test "x$4" != "x" ; then
- AC_CHECK_HEADER([${$1_DIR}/include/$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
- fi
- CPPFLAGS="${saved_cppflags}"
- else
- if test "x$4" != "x" ; then
- AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
- fi
+ fi
+ $1_INCLUDE="${$1_INCLUDE} $6"
+ if test "x$4" = "x" ; then # no header, assume found
+ $1_HEADER_FOUND="1"
+ else # check for the header
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE} $6"
+ AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
+ CPPFLAGS="${saved_cppflags}"
fi
if test "x${$1_HEADER_FOUND}" = "x0" ; then
$1_LIB=""
@@ -145,12 +164,30 @@
PBX_$1=1
# XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define this to indicate the ${$1_DESCRIP} library])
- AC_DEFINE_UNQUOTED([HAVE_$1_VERSION], [$6], [Define to indicate the ${$1_DESCRIP} library version])
+ AC_DEFINE_UNQUOTED([HAVE_$1_VERSION], [$7], [Define to indicate the ${$1_DESCRIP} library version])
fi
fi
fi
])
+
+# Check for a package using $2-config. Similar to AST_EXT_LIB_CHECK,
+# but use $2-config to determine cflags and libraries to use.
+
+# AST_EXT_TOOL_CHECK([package], [tool name], [symbol], [version])
+AC_DEFUN([AST_EXT_TOOL_CHECK],
+[
+ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
+ PBX_$1=0
+ AC_CHECK_TOOL(CONFIG_$1, $2-config, No)
+ if test ! "x${CONFIG_$1}" = xNo; then
+ $1_INCLUDE=$(${CONFIG_$1} --cflags $3)
+ $1_LIB=$(${CONFIG_$1} --libs $3)
+ PBX_$1=1
+ AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])
+ fi
+ fi
+])
AC_DEFUN(
[AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
@@ -813,7 +850,8 @@
dnl @version 2006-05-29
[... 40149 lines stripped ...]
More information about the asterisk-commits
mailing list