[asterisk-commits] rizzo: branch group/video_console r89603 - in /team/group/video_console: ./ a...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Nov 26 12:19:25 CST 2007
Author: rizzo
Date: Mon Nov 26 12:19:23 2007
New Revision: 89603
URL: http://svn.digium.com/view/asterisk?view=rev&rev=89603
Log:
merging...
Added:
team/group/video_console/funcs/func_sysinfo.c
- copied unchanged from r89593, trunk/funcs/func_sysinfo.c
team/group/video_console/include/asterisk/_private.h
- copied unchanged from r89593, trunk/include/asterisk/_private.h
team/group/video_console/include/asterisk/mod_format.h
- copied unchanged from r89593, trunk/include/asterisk/mod_format.h
Removed:
team/group/video_console/channels/gentone-ulaw.c
Modified:
team/group/video_console/ (props changed)
team/group/video_console/CHANGES
team/group/video_console/Makefile
team/group/video_console/Makefile.moddir_rules
team/group/video_console/UPGRADE.txt
team/group/video_console/acinclude.m4
team/group/video_console/agi/eagi-test.c
team/group/video_console/apps/Makefile
team/group/video_console/apps/app_adsiprog.c
team/group/video_console/apps/app_alarmreceiver.c
team/group/video_console/apps/app_amd.c
team/group/video_console/apps/app_authenticate.c
team/group/video_console/apps/app_cdr.c
team/group/video_console/apps/app_chanisavail.c
team/group/video_console/apps/app_channelredirect.c
team/group/video_console/apps/app_chanspy.c
team/group/video_console/apps/app_controlplayback.c
team/group/video_console/apps/app_db.c
team/group/video_console/apps/app_dial.c
team/group/video_console/apps/app_dictate.c
team/group/video_console/apps/app_directed_pickup.c
team/group/video_console/apps/app_directory.c
team/group/video_console/apps/app_disa.c
team/group/video_console/apps/app_dumpchan.c
team/group/video_console/apps/app_echo.c
team/group/video_console/apps/app_exec.c
team/group/video_console/apps/app_externalivr.c
team/group/video_console/apps/app_festival.c
team/group/video_console/apps/app_flash.c
team/group/video_console/apps/app_followme.c
team/group/video_console/apps/app_forkcdr.c
team/group/video_console/apps/app_getcpeid.c
team/group/video_console/apps/app_ices.c
team/group/video_console/apps/app_image.c
team/group/video_console/apps/app_ivrdemo.c
team/group/video_console/apps/app_macro.c
team/group/video_console/apps/app_meetme.c
team/group/video_console/apps/app_milliwatt.c
team/group/video_console/apps/app_minivm.c
team/group/video_console/apps/app_mixmonitor.c
team/group/video_console/apps/app_morsecode.c
team/group/video_console/apps/app_mp3.c
team/group/video_console/apps/app_nbscat.c
team/group/video_console/apps/app_osplookup.c
team/group/video_console/apps/app_page.c
team/group/video_console/apps/app_parkandannounce.c
team/group/video_console/apps/app_playback.c
team/group/video_console/apps/app_privacy.c
team/group/video_console/apps/app_queue.c
team/group/video_console/apps/app_read.c
team/group/video_console/apps/app_readexten.c
team/group/video_console/apps/app_readfile.c
team/group/video_console/apps/app_record.c
team/group/video_console/apps/app_rpt.c
team/group/video_console/apps/app_sayunixtime.c
team/group/video_console/apps/app_senddtmf.c
team/group/video_console/apps/app_sendtext.c
team/group/video_console/apps/app_setcallerid.c
team/group/video_console/apps/app_skel.c
team/group/video_console/apps/app_sms.c
team/group/video_console/apps/app_softhangup.c
team/group/video_console/apps/app_speech_utils.c
team/group/video_console/apps/app_stack.c
team/group/video_console/apps/app_system.c
team/group/video_console/apps/app_talkdetect.c
team/group/video_console/apps/app_test.c
team/group/video_console/apps/app_transfer.c
team/group/video_console/apps/app_url.c
team/group/video_console/apps/app_userevent.c
team/group/video_console/apps/app_verbose.c
team/group/video_console/apps/app_voicemail.c
team/group/video_console/apps/app_waitforring.c
team/group/video_console/apps/app_waitforsilence.c
team/group/video_console/apps/app_while.c
team/group/video_console/apps/app_zapateller.c
team/group/video_console/apps/app_zapbarge.c
team/group/video_console/apps/app_zapras.c
team/group/video_console/apps/app_zapscan.c
team/group/video_console/build_tools/make_buildopts_h
team/group/video_console/build_tools/strip_nonapi
team/group/video_console/cdr/cdr_adaptive_odbc.c
team/group/video_console/cdr/cdr_csv.c
team/group/video_console/cdr/cdr_custom.c
team/group/video_console/cdr/cdr_manager.c
team/group/video_console/cdr/cdr_odbc.c
team/group/video_console/cdr/cdr_pgsql.c
team/group/video_console/cdr/cdr_radius.c
team/group/video_console/cdr/cdr_sqlite.c
team/group/video_console/cdr/cdr_sqlite3_custom.c
team/group/video_console/cdr/cdr_tds.c
team/group/video_console/channels/Makefile
team/group/video_console/channels/chan_agent.c
team/group/video_console/channels/chan_alsa.c
team/group/video_console/channels/chan_features.c
team/group/video_console/channels/chan_gtalk.c
team/group/video_console/channels/chan_h323.c
team/group/video_console/channels/chan_iax2.c
team/group/video_console/channels/chan_jingle.c
team/group/video_console/channels/chan_local.c
team/group/video_console/channels/chan_mgcp.c
team/group/video_console/channels/chan_misdn.c
team/group/video_console/channels/chan_nbs.c
team/group/video_console/channels/chan_oss.c
team/group/video_console/channels/chan_phone.c
team/group/video_console/channels/chan_sip.c
team/group/video_console/channels/chan_skinny.c
team/group/video_console/channels/chan_unistim.c
team/group/video_console/channels/chan_usbradio.c
team/group/video_console/channels/chan_vpb.cc
team/group/video_console/channels/chan_zap.c
team/group/video_console/channels/h323/ast_h323.cxx
team/group/video_console/channels/iax2-provision.c
team/group/video_console/channels/misdn_config.c
team/group/video_console/codecs/codec_a_mu.c
team/group/video_console/codecs/codec_adpcm.c
team/group/video_console/codecs/codec_alaw.c
team/group/video_console/codecs/codec_g722.c
team/group/video_console/codecs/codec_g726.c
team/group/video_console/codecs/codec_gsm.c
team/group/video_console/codecs/codec_ilbc.c
team/group/video_console/codecs/codec_lpc10.c
team/group/video_console/codecs/codec_speex.c
team/group/video_console/codecs/codec_ulaw.c
team/group/video_console/codecs/codec_zap.c
team/group/video_console/configs/agents.conf.sample
team/group/video_console/configs/extensions.conf.sample
team/group/video_console/configs/res_odbc.conf.sample
team/group/video_console/configs/sip.conf.sample
team/group/video_console/configure
team/group/video_console/configure.ac
team/group/video_console/doc/CODING-GUIDELINES
team/group/video_console/doc/tex/localchannel.tex
team/group/video_console/doc/tex/queues-with-callback-members.tex
team/group/video_console/formats/format_g723.c
team/group/video_console/formats/format_g726.c
team/group/video_console/formats/format_g729.c
team/group/video_console/formats/format_gsm.c
team/group/video_console/formats/format_h263.c
team/group/video_console/formats/format_h264.c
team/group/video_console/formats/format_ilbc.c
team/group/video_console/formats/format_jpeg.c
team/group/video_console/formats/format_ogg_vorbis.c
team/group/video_console/formats/format_pcm.c
team/group/video_console/formats/format_sln.c
team/group/video_console/formats/format_vox.c
team/group/video_console/formats/format_wav.c
team/group/video_console/formats/format_wav_gsm.c
team/group/video_console/funcs/func_base64.c
team/group/video_console/funcs/func_blacklist.c
team/group/video_console/funcs/func_callerid.c
team/group/video_console/funcs/func_cdr.c
team/group/video_console/funcs/func_channel.c
team/group/video_console/funcs/func_curl.c
team/group/video_console/funcs/func_cut.c
team/group/video_console/funcs/func_db.c
team/group/video_console/funcs/func_enum.c
team/group/video_console/funcs/func_env.c
team/group/video_console/funcs/func_global.c
team/group/video_console/funcs/func_groupcount.c
team/group/video_console/funcs/func_iconv.c
team/group/video_console/funcs/func_lock.c
team/group/video_console/funcs/func_logic.c
team/group/video_console/funcs/func_math.c
team/group/video_console/funcs/func_md5.c
team/group/video_console/funcs/func_module.c
team/group/video_console/funcs/func_odbc.c
team/group/video_console/funcs/func_rand.c
team/group/video_console/funcs/func_realtime.c
team/group/video_console/funcs/func_sha1.c
team/group/video_console/funcs/func_shell.c
team/group/video_console/funcs/func_strings.c
team/group/video_console/funcs/func_timeout.c
team/group/video_console/funcs/func_uri.c
team/group/video_console/funcs/func_version.c
team/group/video_console/funcs/func_vmcount.c
team/group/video_console/funcs/func_volume.c
team/group/video_console/include/asterisk.h
team/group/video_console/include/asterisk/abstract_jb.h
team/group/video_console/include/asterisk/ael_structs.h
team/group/video_console/include/asterisk/app.h
team/group/video_console/include/asterisk/audiohook.h
team/group/video_console/include/asterisk/autoconfig.h.in
team/group/video_console/include/asterisk/channel.h
team/group/video_console/include/asterisk/compat.h
team/group/video_console/include/asterisk/file.h
team/group/video_console/include/asterisk/frame.h
team/group/video_console/include/asterisk/image.h
team/group/video_console/include/asterisk/lock.h
team/group/video_console/include/asterisk/module.h
team/group/video_console/include/asterisk/paths.h
team/group/video_console/include/asterisk/pbx.h
team/group/video_console/include/asterisk/res_odbc.h
team/group/video_console/include/asterisk/utils.h
team/group/video_console/main/Makefile
team/group/video_console/main/abstract_jb.c
team/group/video_console/main/acl.c
team/group/video_console/main/adsistub.c
team/group/video_console/main/alaw.c
team/group/video_console/main/app.c
team/group/video_console/main/asterisk.c
team/group/video_console/main/astmm.c
team/group/video_console/main/astobj2.c
team/group/video_console/main/audiohook.c
team/group/video_console/main/autoservice.c
team/group/video_console/main/callerid.c
team/group/video_console/main/cdr.c
team/group/video_console/main/channel.c
team/group/video_console/main/chanvars.c
team/group/video_console/main/cli.c
team/group/video_console/main/config.c
team/group/video_console/main/cryptostub.c
team/group/video_console/main/cygload.c
team/group/video_console/main/db.c
team/group/video_console/main/devicestate.c
team/group/video_console/main/dial.c
team/group/video_console/main/dns.c
team/group/video_console/main/dnsmgr.c
team/group/video_console/main/dsp.c
team/group/video_console/main/enum.c
team/group/video_console/main/event.c
team/group/video_console/main/file.c
team/group/video_console/main/frame.c
team/group/video_console/main/hashtab.c
team/group/video_console/main/http.c
team/group/video_console/main/image.c
team/group/video_console/main/indications.c
team/group/video_console/main/io.c
team/group/video_console/main/jitterbuf.c
team/group/video_console/main/loader.c
team/group/video_console/main/logger.c
team/group/video_console/main/manager.c
team/group/video_console/main/minimime/mm.h
team/group/video_console/main/netsock.c
team/group/video_console/main/pbx.c
team/group/video_console/main/privacy.c
team/group/video_console/main/rtp.c
team/group/video_console/main/say.c
team/group/video_console/main/sched.c
team/group/video_console/main/sha1.c
team/group/video_console/main/slinfactory.c
team/group/video_console/main/srv.c
team/group/video_console/main/tdd.c
team/group/video_console/main/term.c
team/group/video_console/main/threadstorage.c
team/group/video_console/main/translate.c
team/group/video_console/main/udptl.c
team/group/video_console/main/ulaw.c
team/group/video_console/main/utils.c
team/group/video_console/makeopts.in
team/group/video_console/pbx/Makefile
team/group/video_console/pbx/pbx_ael.c
team/group/video_console/pbx/pbx_config.c
team/group/video_console/pbx/pbx_dundi.c
team/group/video_console/pbx/pbx_gtkconsole.c
team/group/video_console/pbx/pbx_loopback.c
team/group/video_console/pbx/pbx_lua.c
team/group/video_console/pbx/pbx_realtime.c
team/group/video_console/pbx/pbx_spool.c
team/group/video_console/res/Makefile
team/group/video_console/res/ael/pval.c
team/group/video_console/res/res_adsi.c
team/group/video_console/res/res_ael_share.c
team/group/video_console/res/res_agi.c
team/group/video_console/res/res_clioriginate.c
team/group/video_console/res/res_config_odbc.c
team/group/video_console/res/res_config_pgsql.c
team/group/video_console/res/res_config_sqlite.c
team/group/video_console/res/res_convert.c
team/group/video_console/res/res_crypto.c
team/group/video_console/res/res_features.c
team/group/video_console/res/res_indications.c
team/group/video_console/res/res_jabber.c
team/group/video_console/res/res_limit.c
team/group/video_console/res/res_monitor.c
team/group/video_console/res/res_musiconhold.c
team/group/video_console/res/res_odbc.c
team/group/video_console/res/res_realtime.c
team/group/video_console/res/res_smdi.c
team/group/video_console/res/res_snmp.c
team/group/video_console/res/res_speech.c
team/group/video_console/utils/Makefile
team/group/video_console/utils/ael_main.c
team/group/video_console/utils/check_expr.c
team/group/video_console/utils/conf2ael.c
team/group/video_console/utils/extconf.c
team/group/video_console/utils/hashtest2.c
team/group/video_console/utils/smsq.c
Propchange: team/group/video_console/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/video_console/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 26 12:19:23 2007
@@ -1,1 +1,1 @@
-/trunk:1-89414
+/trunk:1-89593
Modified: team/group/video_console/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/video_console/CHANGES?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/CHANGES (original)
+++ team/group/video_console/CHANGES Mon Nov 26 12:19:23 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
-----------
@@ -51,6 +52,10 @@
* Added 'core show channels count' CLI command.
* Added the ability to set the core debug and verbose values on a per-file basis.
* Added 'queue pause member' and 'queue unpause member' CLI commands
+ * Ability to set process limits ("ulimit") without restarting Asterisk
+ * Enhanced "agi debug" to print the channel name as a prefix to the debug
+ output to make debugging on busy systems much easier.
+ * New CLI commands "dialplan set extenpatternmatching true/false"
SIP changes
-----------
@@ -67,7 +72,7 @@
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 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
@@ -85,8 +90,14 @@
* SIP now adds a header to the CANCEL if the call was answered by another phone
in the same dial command, or if the new c option in dial() is used.
* The new default is that 100 Trying is not sent on REGISTER attempts as the RFC specifically
- states it is not needed. For phones, however, that do require it the registertrying option
+ states it is not needed. For phones, however, that do require it the "registertrying" option
has been added so it can be enabled.
+ * The "call-limit" option is marked as deprecated. It still works in this version of
+ Asterisk, but will be removed in the following version. Please use the groupcount functions
+ in the dialplan to enforce call limits.
+ * A new option called "callcounter" (global/peer/user level) enables call counters needed
+ for better status reports needed for queues and SIP subscriptions. (Call-Limit was previously
+ used to enable this functionality).
IAX2 changes
------------
@@ -98,6 +109,7 @@
Skinny changes
-------------
* Added skinny show device, skinny show line, and skinny show settings CLI commands.
+ * Proper codec support in chan_skinny.
DUNDi changes
-------------
@@ -195,6 +207,29 @@
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.
+
+Other Dialplan Application Changes
+----------------------------------
+ * Argument support for Gosub application
+ * From the to-do lists: straighten out the app timeout args:
+ Wait() app now really does 0.3 seconds- was truncating arg to an int.
+ WaitExten() same as Wait().
+ Congestion() - Now takes floating pt. argument.
+ Busy() - now takes floating pt. argument.
+ Read() - timeout now can be floating pt.
+ WaitForRing() now takes floating pt timeout arg.
+ SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
+ * Added 's' option to Page application.
+ * Added 'E' and 'V' commands to ExternalIVR.
+ * Added 'o' and 'X' options to Chanspy.
+ * Added a new dialplan application, Bridge, which allows you to bridge the
+ calling channel to any other active channel on the system.
+ * Added the ability to specify a music on hold class to play instead of ringing
+ for the SLATrunk application.
+ * The Read application no longer exits the dialplan on error. Instead, it sets
+ READSTATUS to ERROR, which you can catch and handle separately.
Music On Hold Changes
---------------------
@@ -268,37 +303,27 @@
Miscellaneous
-------------
* Added the bindaddr option to gtalk.conf.
- * Argument support for Gosub application
- * Ability to set process limits without restarting Asterisk
- * Proper codec support in chan_skinny.
* Ability to use libcap to set high ToS bits when non-root
on Linux. If configure is unable to find libcap then you
can use --with-cap to specify the path.
- * Added rotatetimestamp option to logger.conf which will use
- the time to name the logger files instead of sequence number.
+ * Added rotatestrategy option to logger.conf, along with two new options:
+ "timestamp" which will use the time to name the logger files instead of
+ sequence number; and "rotate", which rotates the names of the logfiles,
+ similar to the way syslog rotates files.
+ * Added exec_after_rotate option to logger.conf, which allows a system
+ command to be run after rotation. This is primarily useful with
+ rotatestrategry=rotate, to allow a limit on the number of logfiles kept
+ and to ensure that the oldest log file gets deleted.
* Added Masquerade manager event for when a masquerade happens between
two channels.
- * From the to-do lists: straighten out the app timeout args:
- Wait() app now really does 0.3 seconds- was truncating arg to an int.
- WaitExten() same as Wait().
- Congestion() - Now takes floating pt. argument.
- Busy() - now takes floating pt. argument.
- Read() - timeout now can be floating pt.
- WaitForRing() now takes floating pt timeout arg.
- SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
* Added maxfiles option to options section of asterisk.conf which allows you to specify
what Asterisk should set as the maximum number of open files when it loads.
* Added the jittertargetextra configuration option.
* Added G729 passthrough support to chan_phone for Sigma Designs boards.
- * Added 's' option to Page application.
- * Added 'E' and 'V' commands to ExternalIVR.
- * Added 'o' and 'X' options to Chanspy.
* Added a new CDR module, cdr_sqlite3_custom.
* The cdr_manager module has a [mappings] feature, like cdr_custom,
to add fields to the manager event from the CDR variables.
* Added a new realtime configuration module, res_config_sqlite
- * Added a new dialplan application, Bridge, which allows you to bridge the
- calling channel to any other active channel on the system.
* Added support for setting the CoS for VLAN traffic (802.1p). See the sample
configuration files for the IP channel drivers. The new option is "cos".
This information is also documented in doc/qos.tex, or the IP Quality of Service
@@ -318,8 +343,15 @@
It allows you to configure a prefix for auto-monitor recordings.
* Added support for writing and running your dialplan in lua. See
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.
- * Enhanced "agi debug" to print the channel name as a prefix to the debug
- output to make debugging on busy systems much easier.
+ * 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.
+ * A new extension pattern matching algorithm, based on a trie, is introduced
+ here, that could noticeably speed up mid-sized to large dialplans.
+ It is NOT used by default, as duplicating the behaviour of the old pattern
+ matcher is still under development. A config file option, in extensions.conf,
+ in the [general] section, called "extenpatternmatchingnew", is by default
+ set to false; setting that to true will force the use of the new algorithm.
+ Also, the cli commands "dialplan set extenpatternmatchingnew true/false" can
+ be used to switch the algorithms at run time.
+
Modified: team/group/video_console/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/video_console/Makefile?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/Makefile (original)
+++ team/group/video_console/Makefile Mon Nov 26 12:19:23 2007
@@ -277,10 +277,6 @@
SOLINK=-shared -fpic -L/usr/local/ssl/lib
endif
-ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
- SOLINK=-Xlinker -r
-endif
-
# This is used when generating the doxygen documentation
ifneq ($(DOT),:)
HAVEDOT=yes
@@ -298,7 +294,7 @@
endif
# comment to print directories during submakes
-PRINT_DIR:= --no-print-directory
+PRINT_DIR?= --no-print-directory
all: _all
@echo " +--------- Asterisk Build Complete ---------+"
@@ -308,7 +304,7 @@
@echo " + $(mK) install +"
@echo " +-------------------------------------------+"
-_all: cleantest $(SUBDIRS)
+_all: cleantest makeopts $(SUBDIRS)
makeopts: configure
@echo "****"
Modified: team/group/video_console/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/video_console/Makefile.moddir_rules?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/Makefile.moddir_rules (original)
+++ team/group/video_console/Makefile.moddir_rules Mon Nov 26 12:19:23 2007
@@ -63,6 +63,12 @@
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),)
Modified: team/group/video_console/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/video_console/UPGRADE.txt?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/UPGRADE.txt (original)
+++ team/group/video_console/UPGRADE.txt Mon Nov 26 12:19:23 2007
@@ -78,6 +78,9 @@
introduced dialplan functions LOCK(), TRYLOCK(), and UNLOCK(). You may use
these functions in any location where you desire to ensure that only one
channel is executing that path at any one time.
+* Read() now sets a READSTATUS variable on exit. It does NOT automatically
+ return -1 (and hangup) anymore on error. If you want to hangup on error,
+ you need to do so explicitly in your dialplan.
Dialplan Functions:
Modified: team/group/video_console/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/group/video_console/acinclude.m4?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/acinclude.m4 (original)
+++ team/group/video_console/acinclude.m4 Mon Nov 26 12:19:23 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,28 +164,29 @@
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 tool using xxx-config
-# AST_EXT_TOOL_CHECK([package symbol name], [package library name], [symbol], [version])
+# 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],
[
-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
-AC_SUBST(PBX_$1)
-AC_SUBST($1_INCLUDE)
-AC_SUBST($1_LIB)
+ 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(
@@ -830,7 +850,8 @@
dnl @version 2006-05-29
dnl @license GPLWithACException
-AC_DEFUN([ACX_PTHREAD], [
+AC_DEFUN([ACX_PTHREAD],
+[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_LANG_SAVE
AC_LANG_C
Modified: team/group/video_console/agi/eagi-test.c
URL: http://svn.digium.com/view/asterisk/team/group/video_console/agi/eagi-test.c?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/agi/eagi-test.c (original)
+++ team/group/video_console/agi/eagi-test.c Mon Nov 26 12:19:23 2007
@@ -5,16 +5,7 @@
* with no warranty of any kind
*/
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/select.h>
-
#include "asterisk.h"
-
-#include "asterisk/compat.h"
#define AUDIO_FILENO (STDERR_FILENO + 1)
Modified: team/group/video_console/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/video_console/apps/Makefile?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/apps/Makefile (original)
+++ team/group/video_console/apps/Makefile Mon Nov 26 12:19:23 2007
@@ -39,3 +39,9 @@
all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules
+
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+ LIBS+= -lres_features.so -lres_ael_share.so -lres_monitor.so -lres_speech.so
+ LIBS+= -lres_smdi.so
+endif
+
Modified: team/group/video_console/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/group/video_console/apps/app_adsiprog.c?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/apps/app_adsiprog.c (original)
+++ team/group/video_console/apps/app_adsiprog.c Mon Nov 26 12:19:23 2007
@@ -35,15 +35,13 @@
#include <netinet/in.h>
#include <ctype.h>
-#include <errno.h>
-
+
+#include "asterisk/paths.h" /* use ast_config_AST_CONFIG_DIR */
#include "asterisk/file.h"
-#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/adsi.h"
-#include "asterisk/options.h"
#include "asterisk/utils.h"
#include "asterisk/lock.h"
Modified: team/group/video_console/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/group/video_console/apps/app_alarmreceiver.c?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/apps/app_alarmreceiver.c (original)
+++ team/group/video_console/apps/app_alarmreceiver.c Mon Nov 26 12:19:23 2007
@@ -39,13 +39,11 @@
#include "asterisk/lock.h"
#include "asterisk/file.h"
-#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/translate.h"
#include "asterisk/ulaw.h"
-#include "asterisk/options.h"
#include "asterisk/app.h"
#include "asterisk/dsp.h"
#include "asterisk/config.h"
Modified: team/group/video_console/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/group/video_console/apps/app_amd.c?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/apps/app_amd.c (original)
+++ team/group/video_console/apps/app_amd.c Mon Nov 26 12:19:23 2007
@@ -33,7 +33,6 @@
#include "asterisk/module.h"
#include "asterisk/lock.h"
-#include "asterisk/options.h"
#include "asterisk/channel.h"
#include "asterisk/dsp.h"
#include "asterisk/pbx.h"
Modified: team/group/video_console/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/group/video_console/apps/app_authenticate.c?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/apps/app_authenticate.c (original)
+++ team/group/video_console/apps/app_authenticate.c Mon Nov 26 12:19:23 2007
@@ -29,18 +29,14 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <errno.h>
-
#include "asterisk/lock.h"
#include "asterisk/file.h"
-#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
#include "asterisk/astdb.h"
#include "asterisk/utils.h"
-#include "asterisk/options.h"
enum {
OPT_ACCOUNT = (1 << 0),
Modified: team/group/video_console/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/group/video_console/apps/app_cdr.c?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/apps/app_cdr.c (original)
+++ team/group/video_console/apps/app_cdr.c Mon Nov 26 12:19:23 2007
@@ -31,7 +31,6 @@
#include "asterisk/channel.h"
#include "asterisk/module.h"
-#include "asterisk/pbx.h"
static char *nocdr_descrip =
" NoCDR(): This application will tell Asterisk not to maintain a CDR for the\n"
Modified: team/group/video_console/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/group/video_console/apps/app_chanisavail.c?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/apps/app_chanisavail.c (original)
+++ team/group/video_console/apps/app_chanisavail.c Mon Nov 26 12:19:23 2007
@@ -31,18 +31,15 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <errno.h>
#include <sys/ioctl.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
-#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
#include "asterisk/devicestate.h"
-#include "asterisk/options.h"
static char *app = "ChanIsAvail";
Modified: team/group/video_console/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/group/video_console/apps/app_channelredirect.c?view=diff&rev=89603&r1=89602&r2=89603
==============================================================================
--- team/group/video_console/apps/app_channelredirect.c (original)
+++ team/group/video_console/apps/app_channelredirect.c Mon Nov 26 12:19:23 2007
@@ -28,14 +28,12 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/file.h"
-#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/lock.h"
#include "asterisk/app.h"
#include "asterisk/features.h"
[... 31073 lines stripped ...]
More information about the asterisk-commits
mailing list