[svn-commits] branch jcollie/bug7131 r30386 - in
/team/jcollie/bug7131: ./ apps/ build_tool...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu May 25 13:08:59 MST 2006
Author: jcollie
Date: Thu May 25 15:08:59 2006
New Revision: 30386
URL: http://svn.digium.com/view/asterisk?rev=30386&view=rev
Log:
Merged revisions 29553-29554,29556,29570,29592,29619,29641,29665,29667-29668,29703-29708,29727,29731,29734-29735,29765-29766,29803,29825,29846-29848,29850,29880,29903,29905,29935,29938,29970,29972,29988,30010,30012,30034,30036,30038-30040,30068,30070,30099,30104,30131-30132,30152,30173,30194,30216,30240-30242,30271-30272,30294,30297,30299,30328,30337,30359-30361 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r29553 | mogorman | 2006-05-22 16:12:30 -0500 (Mon, 22 May 2006) | 1 line
asterisk-xmpp merge in
................
r29554 | kpfleming | 2006-05-22 16:20:01 -0500 (Mon, 22 May 2006) | 2 lines
bootstrap updates to include xmpp related stuff
................
r29556 | file | 2006-05-22 16:28:32 -0500 (Mon, 22 May 2006) | 10 lines
Merged revisions 29555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29555 | file | 2006-05-22 18:27:12 -0300 (Mon, 22 May 2006) | 2 lines
Increase the silence threshold to 128 to "fix" it, so I'm told. (issue #6595 reported by davetroy fixed by casper)
........
................
r29570 | kpfleming | 2006-05-22 17:02:38 -0500 (Mon, 22 May 2006) | 2 lines
remove properties from the xmpp merge
................
r29592 | mogorman | 2006-05-22 17:51:56 -0500 (Mon, 22 May 2006) | 3 lines
patch from bug 0007204 to make bug 5750 follow standard
manager naming convention.
................
r29619 | markster | 2006-05-22 23:49:31 -0500 (Mon, 22 May 2006) | 2 lines
Handle ringing (early) state properly on SIP
................
r29641 | oej | 2006-05-23 06:15:57 -0500 (Tue, 23 May 2006) | 2 lines
Formatting, typos
................
r29665 | oej | 2006-05-23 07:14:35 -0500 (Tue, 23 May 2006) | 2 lines
Code formatting
................
r29667 | crichter | 2006-05-23 07:38:06 -0500 (Tue, 23 May 2006) | 10 lines
* export_ies uses now _VAR else the vars are not copied to the dest chan
* when receiving a connect from the NT Side we wait until we have the final
l3id until we queue the answer to asterisk to avoid bridging conflicts
* when not bridged to misdn we had a segfault after receiving the connect
due to a strcasecmp bug.. this didn't happen before, cause we hadn't had
the bridge before
* cleanup of the bchannels is queued now, due to possible race conditions
* added mISDN_clear_stack when cleaning the bchannel
................
r29668 | oej | 2006-05-23 07:39:48 -0500 (Tue, 23 May 2006) | 2 lines
Breaking once will stop us... :-)
................
r29703 | russell | 2006-05-23 11:25:37 -0500 (Tue, 23 May 2006) | 2 lines
update chan_jingle to reflect the recent change to the indicate prototype
................
r29704 | russell | 2006-05-23 11:33:04 -0500 (Tue, 23 May 2006) | 2 lines
remove an unnecessary error message that is really an old debug message
................
r29705 | bweschke | 2006-05-23 11:35:46 -0500 (Tue, 23 May 2006) | 3 lines
app_meetme Muting and Manager API enhancements #6731 (softins w/some minor mods to accomodate recent enum work)
................
r29706 | bweschke | 2006-05-23 11:37:40 -0500 (Tue, 23 May 2006) | 11 lines
Merged revisions 29696 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29696 | bweschke | 2006-05-23 11:58:24 -0400 (Tue, 23 May 2006) | 3 lines
Fix a potential leak and correct (hopefully) a segfault under certain conditions. #6784 (vovan and perry testing)
........
................
r29707 | russell | 2006-05-23 11:37:46 -0500 (Tue, 23 May 2006) | 2 lines
remove another excess "debug" message
................
r29708 | mogorman | 2006-05-23 11:43:58 -0500 (Tue, 23 May 2006) | 3 lines
finish cleaning up some more stuff before russell
gets a chance to.
................
r29727 | kpfleming | 2006-05-23 12:04:07 -0500 (Tue, 23 May 2006) | 3 lines
restore AST_LIST_HEAD_INIT (with no users in the tree right now)
update ast_mutex_init to allow mutexes that are all zero bytes to be initialized (in the case of a dynamically-allocated structure containing a mutex)
................
r29731 | russell | 2006-05-23 12:09:51 -0500 (Tue, 23 May 2006) | 2 lines
on a clean, we have to clean out the ael directory too
................
r29734 | bweschke | 2006-05-23 12:21:02 -0500 (Tue, 23 May 2006) | 3 lines
What's good for 1.2 isn't good for /trunk. Fix for /trunk coming next...
................
r29735 | bweschke | 2006-05-23 12:31:05 -0500 (Tue, 23 May 2006) | 3 lines
Sanity check code for an extended failure in trying to obtain a channel lock that may have been obtained elsewhere. Prevents the monitor thread of the SIP module from going into an infinite loop, effectively, breaking SIP until you restart Asterisk or the mutex is unlocked, whichever comes first.
................
r29765 | kpfleming | 2006-05-23 13:17:40 -0500 (Tue, 23 May 2006) | 10 lines
Merged revisions 29764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29764 | kpfleming | 2006-05-23 13:16:40 -0500 (Tue, 23 May 2006) | 2 lines
simplify/fix lock retry, and fix comment
........
................
r29766 | mogorman | 2006-05-23 13:23:05 -0500 (Tue, 23 May 2006) | 3 lines
allows for configurable answer timeout on attended transfer
patch 0006763 with minor changes.
................
r29803 | crichter | 2006-05-23 14:40:16 -0500 (Tue, 23 May 2006) | 1 line
added a l1watcher timeout, therefore removed the old behaviour of guessing the l1state.
................
r29825 | mogorman | 2006-05-23 15:25:23 -0500 (Tue, 23 May 2006) | 2 lines
fixes bug where server goes away.
................
r29846 | mattf | 2006-05-23 16:10:55 -0500 (Tue, 23 May 2006) | 2 lines
Bump up the echo tail length option
................
r29847 | mogorman | 2006-05-23 16:18:07 -0500 (Tue, 23 May 2006) | 3 lines
hmm still need a way to get rid of connections
later on.
................
r29848 | mogorman | 2006-05-23 16:28:14 -0500 (Tue, 23 May 2006) | 2 lines
get rid of that transport sillyness
................
r29850 | russell | 2006-05-23 16:46:26 -0500 (Tue, 23 May 2006) | 10 lines
Merged revisions 29849 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29849 | russell | 2006-05-23 17:44:52 -0400 (Tue, 23 May 2006) | 2 lines
fix the sourceaddress option (issue #7213, alphaque)
........
................
r29880 | russell | 2006-05-23 17:57:03 -0500 (Tue, 23 May 2006) | 3 lines
further codec module optimization based on codec_alaw changes by rizzo
(issue #7190, Mithraen)
................
r29903 | kpfleming | 2006-05-23 22:28:49 -0500 (Tue, 23 May 2006) | 4 lines
add a new option for 'obscuring' SIP user/peer names from fishers
use an enum for authentication results and clean up code
fix a bug where SUBSCRIBE for an unknown user/peer would not generate a response
................
r29905 | kpfleming | 2006-05-23 22:32:55 -0500 (Tue, 23 May 2006) | 2 lines
block SIP obscurity fix from merging... trunk version was different
................
r29935 | jdixon | 2006-05-24 02:01:02 -0500 (Wed, 24 May 2006) | 2 lines
Added incoming audio notch filtering, plus a bunch of command improvements, etc.
................
r29938 | crichter | 2006-05-24 02:58:52 -0500 (Wed, 24 May 2006) | 1 line
fixed to early connect bug which came in yesterday.., also added the transmit of progress indicators through channel vars
................
r29970 | kpfleming | 2006-05-24 11:19:57 -0500 (Wed, 24 May 2006) | 10 lines
Merged revisions 29969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29969 | kpfleming | 2006-05-24 11:17:26 -0500 (Wed, 24 May 2006) | 2 lines
respect 'usecallingpres' in zapata.conf even if CLID has not been set for the channel (issue #7123)
........
................
r29972 | kpfleming | 2006-05-24 11:54:10 -0500 (Wed, 24 May 2006) | 10 lines
Merged revisions 29971 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29971 | kpfleming | 2006-05-24 11:52:08 -0500 (Wed, 24 May 2006) | 2 lines
fix various bugs related to exiting from queue via keypress and moh handling (issue #6776, different fix)
........
................
r29988 | kpfleming | 2006-05-24 12:02:54 -0500 (Wed, 24 May 2006) | 10 lines
Merged revisions 29973 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29973 | kpfleming | 2006-05-24 11:59:20 -0500 (Wed, 24 May 2006) | 2 lines
support video recording via AGI 'RECORD FILE' command (issue #7068)
........
................
r30010 | oej | 2006-05-24 13:17:50 -0500 (Wed, 24 May 2006) | 2 lines
Typo fix. Thanks Peter!
................
r30012 | kpfleming | 2006-05-24 13:18:14 -0500 (Wed, 24 May 2006) | 2 lines
don't force the compiler name
................
r30034 | file | 2006-05-24 14:16:07 -0500 (Wed, 24 May 2006) | 10 lines
Merged revisions 30033 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30033 | file | 2006-05-24 16:14:01 -0300 (Wed, 24 May 2006) | 2 lines
Fix deadlock caused by a race condition in the logger when reloading (issue #7195 reported and fixed by softins)
........
................
r30036 | file | 2006-05-24 14:46:14 -0500 (Wed, 24 May 2006) | 9 lines
Blocked revisions 30035 via svnmerge
........
r30035 | file | 2006-05-24 16:44:26 -0300 (Wed, 24 May 2006) | 2 lines
Merge branch for bug 6264 (Privacy option 2 returns dial-status ANSWER / option_priority_jumping not respected) (reported by jkoopmann and branch by murf
........
................
r30038 | oej | 2006-05-24 14:58:36 -0500 (Wed, 24 May 2006) | 2 lines
Typo
................
r30039 | mogorman | 2006-05-24 14:59:04 -0500 (Wed, 24 May 2006) | 2 lines
reset timeout on reconnect.
................
r30040 | file | 2006-05-24 15:00:10 -0500 (Wed, 24 May 2006) | 2 lines
Merge branch for bug 6264 (Privacy option 2 returns dial-status ANSWER / option_priority_jumping not respected) (reported by jkoopmann and branch by murf)
................
r30068 | mogorman | 2006-05-24 15:07:02 -0500 (Wed, 24 May 2006) | 11 lines
Merged revisions 30037 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r30037 | mogorman | 2006-05-24 14:55:21 -0500 (Wed, 24 May 2006) | 3 lines
app_meemte used the ast_max_exten instead of path_max
solves bug 6822
........
................
r30070 | kpfleming | 2006-05-24 15:37:45 -0500 (Wed, 24 May 2006) | 2 lines
don't send CANCEL for an INVITE that we haven't received a provisional response for yet... mark it pending until a response arrives (issue #7079)
................
r30099 | kpfleming | 2006-05-24 16:25:46 -0500 (Wed, 24 May 2006) | 2 lines
block chan_sip fix that is not broken here :-)
................
r30104 | file | 2006-05-24 17:00:37 -0500 (Wed, 24 May 2006) | 2 lines
Update some documentation (file internal brain bug #42)
................
r30131 | file | 2006-05-24 18:08:39 -0500 (Wed, 24 May 2006) | 2 lines
Nothing to see here... move along
................
r30132 | crichter | 2006-05-24 18:21:03 -0500 (Wed, 24 May 2006) | 1 line
added EVENT_NEW_CHANNEL. We change the channel name now when we got the real channel, also changed name generation to new stringfield api
................
r30152 | bweschke | 2006-05-24 19:11:30 -0500 (Wed, 24 May 2006) | 3 lines
Make sure we catch all the instances where a member didn't answer the call sent to them rather than just on a timeout after a dial attempt and some minor code cleanup/reuse.
................
r30173 | bweschke | 2006-05-24 20:40:20 -0500 (Wed, 24 May 2006) | 3 lines
Doxygen comment for Qwell
................
r30194 | bweschke | 2006-05-25 08:51:44 -0500 (Thu, 25 May 2006) | 3 lines
Making sure a char ptr is initialized before we strchr on it is a GOOD thing. Ya! Testing!
................
r30216 | bweschke | 2006-05-25 09:32:15 -0500 (Thu, 25 May 2006) | 3 lines
Properly initialize destination variables before we send them into pbx_substitute_variables_helper(..). Ya! Testing! Take 2.
................
r30240 | file | 2006-05-25 10:29:30 -0500 (Thu, 25 May 2006) | 10 lines
Merged revisions 30239 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30239 | file | 2006-05-25 12:27:44 -0300 (Thu, 25 May 2006) | 2 lines
Get rid of an incorrect SIP dial string in the sample extensions.conf - I even tried variations... no go (issue #7222 reported by arkadia)
........
................
r30241 | russell | 2006-05-25 10:40:38 -0500 (Thu, 25 May 2006) | 3 lines
add DB_DELETE function for the common case of retrieving and deleting a key in
a single operation (issue #7214, twilson)
................
r30242 | file | 2006-05-25 10:42:11 -0500 (Thu, 25 May 2006) | 2 lines
Only get the low 16 bits if we actually have a message count
................
r30271 | file | 2006-05-25 11:14:17 -0500 (Thu, 25 May 2006) | 2 lines
Safely traverse the thread lists and wait until each thread is done before moving on to the next.
................
r30272 | russell | 2006-05-25 11:44:22 -0500 (Thu, 25 May 2006) | 8 lines
- add support for setting an AGISTATUS variable that indicates successful
execution, failure, or if the channel requested hangup.
- only return -1 from the application if the application requested hangup. If
there was just a failure in execution of the AGI, just set the status
variable appropriately and move on in the dialplan.
(issue #7121, original patch by Alessandro Polverini, updated patch by srt,
committed patch is heavily modified to allow still returning -1 on hangup)
................
r30294 | kpfleming | 2006-05-25 12:22:26 -0500 (Thu, 25 May 2006) | 10 lines
Merged revisions 30293 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30293 | kpfleming | 2006-05-25 12:18:01 -0500 (Thu, 25 May 2006) | 2 lines
allow SIPCHANINFO(peername) to work for calls from users as well (issue #7215)
........
................
r30297 | kpfleming | 2006-05-25 12:39:46 -0500 (Thu, 25 May 2006) | 10 lines
Merged revisions 30296 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30296 | kpfleming | 2006-05-25 12:39:33 -0500 (Thu, 25 May 2006) | 2 lines
don't try to use -march=s390 when building on S/390 systems (reported via asterisk-users mailing list)
........
................
r30299 | file | 2006-05-25 12:58:55 -0500 (Thu, 25 May 2006) | 2 lines
Add Archive option to call files and add documentation on them. (issue #5426 reported by ezio - props to blitzrage for proof reading the documentation)
................
r30328 | russell | 2006-05-25 13:31:19 -0500 (Thu, 25 May 2006) | 5 lines
Add the ability to retrieve the exit code of the forked AGI process. If there
is an error executing the AGI script, or the AGI script itself returns a
non-zero value, the AGISTATUS variable will now be set to FAILURE instead of
SUCCESS.
................
r30337 | russell | 2006-05-25 14:01:26 -0500 (Thu, 25 May 2006) | 4 lines
allow setting a channel variable to disable sending SIGHUP to the AGI process
(issue #6491, original patch by juggie, channel variable patch by corydon,
committed patch modified to change variable name and update documentation)
................
r30359 | russell | 2006-05-25 14:07:31 -0500 (Thu, 25 May 2006) | 6 lines
- mark some applications deprecated that already have replacements
- add BLACKLIST and mark LookupBlacklist deprecated
- add transfercapability support to CHANNEL and mark SetTransferCapability
deprecated
(issue #7225, Corydon)
................
r30360 | russell | 2006-05-25 14:21:09 -0500 (Thu, 25 May 2006) | 3 lines
add the ability to be able to echo DTMF_BEGIN/END, HTML, and IMAGE frames, too
(issue #7193, Mithraen, with some mods)
................
r30361 | kpfleming | 2006-05-25 14:26:26 -0500 (Thu, 25 May 2006) | 2 lines
use the proper method for adding a new entry
................
Added:
team/jcollie/bug7131/channels/chan_jingle.c
- copied unchanged from r30361, trunk/channels/chan_jingle.c
team/jcollie/bug7131/configs/jabber.conf.sample
- copied unchanged from r30361, trunk/configs/jabber.conf.sample
team/jcollie/bug7131/configs/jingle.conf.sample
- copied unchanged from r30361, trunk/configs/jingle.conf.sample
team/jcollie/bug7131/doc/callfiles.txt
- copied unchanged from r30361, trunk/doc/callfiles.txt
team/jcollie/bug7131/doc/jabber.txt
- copied unchanged from r30361, trunk/doc/jabber.txt
team/jcollie/bug7131/doc/jingle.txt
- copied unchanged from r30361, trunk/doc/jingle.txt
team/jcollie/bug7131/include/asterisk/jabber.h
- copied unchanged from r30361, trunk/include/asterisk/jabber.h
team/jcollie/bug7131/include/asterisk/jingle.h
- copied unchanged from r30361, trunk/include/asterisk/jingle.h
team/jcollie/bug7131/res/res_jabber.c
- copied unchanged from r30361, trunk/res/res_jabber.c
Modified:
team/jcollie/bug7131/ (props changed)
team/jcollie/bug7131/CREDITS
team/jcollie/bug7131/UPGRADE.txt
team/jcollie/bug7131/aclocal.m4
team/jcollie/bug7131/apps/app_db.c
team/jcollie/bug7131/apps/app_dial.c
team/jcollie/bug7131/apps/app_echo.c
team/jcollie/bug7131/apps/app_lookupblacklist.c
team/jcollie/bug7131/apps/app_lookupcidname.c
team/jcollie/bug7131/apps/app_meetme.c
team/jcollie/bug7131/apps/app_queue.c
team/jcollie/bug7131/apps/app_rpt.c
team/jcollie/bug7131/apps/app_setcdruserfield.c
team/jcollie/bug7131/apps/app_settransfercapability.c
team/jcollie/bug7131/apps/app_speech_utils.c
team/jcollie/bug7131/apps/app_waitforsilence.c
team/jcollie/bug7131/asterisk.c
team/jcollie/bug7131/build_tools/menuselect-deps.in
team/jcollie/bug7131/channels/Makefile
team/jcollie/bug7131/channels/chan_iax2.c
team/jcollie/bug7131/channels/chan_misdn.c
team/jcollie/bug7131/channels/chan_sip.c
team/jcollie/bug7131/channels/chan_zap.c
team/jcollie/bug7131/channels/misdn/chan_misdn_config.h
team/jcollie/bug7131/channels/misdn/isdn_lib.c
team/jcollie/bug7131/channels/misdn/isdn_lib.h
team/jcollie/bug7131/channels/misdn/isdn_msg_parser.c
team/jcollie/bug7131/channels/misdn_config.c
team/jcollie/bug7131/codecs/codec_a_mu.c
team/jcollie/bug7131/codecs/codec_ulaw.c
team/jcollie/bug7131/codecs/gsm/Makefile
team/jcollie/bug7131/configs/extensions.conf.sample
team/jcollie/bug7131/configs/features.conf.sample
team/jcollie/bug7131/configs/misdn.conf.sample
team/jcollie/bug7131/configs/sip.conf.sample
team/jcollie/bug7131/configure
team/jcollie/bug7131/configure.ac
team/jcollie/bug7131/doc/channelvariables.txt
team/jcollie/bug7131/funcs/func_channel.c
team/jcollie/bug7131/funcs/func_db.c
team/jcollie/bug7131/include/asterisk/app.h
team/jcollie/bug7131/include/asterisk/devicestate.h
team/jcollie/bug7131/include/asterisk/linkedlists.h
team/jcollie/bug7131/include/asterisk/lock.h
team/jcollie/bug7131/include/autoconfig.h.in
team/jcollie/bug7131/logger.c
team/jcollie/bug7131/makeopts.in
team/jcollie/bug7131/pbx.c
team/jcollie/bug7131/pbx/Makefile
team/jcollie/bug7131/pbx/pbx_spool.c
team/jcollie/bug7131/res/Makefile
team/jcollie/bug7131/res/res_agi.c
team/jcollie/bug7131/res/res_features.c
team/jcollie/bug7131/sample.call
team/jcollie/bug7131/utils/Makefile
Propchange: team/jcollie/bug7131/
------------------------------------------------------------------------------
automerge = *
Propchange: team/jcollie/bug7131/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/jcollie/bug7131/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/jcollie/bug7131/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 25 15:08:59 2006
@@ -1,1 +1,1 @@
-/trunk:1-29524
+/trunk:1-30375
Modified: team/jcollie/bug7131/CREDITS
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7131/CREDITS?rev=30386&r1=30385&r2=30386&view=diff
==============================================================================
--- team/jcollie/bug7131/CREDITS (original)
+++ team/jcollie/bug7131/CREDITS Thu May 25 15:08:59 2006
@@ -79,6 +79,8 @@
Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade
Claude Patry - bug fixes, feature enhancements, and bug marshalling
cpatry at gmail.com
+Miroslav Nachev, miro at space-comm.com COSMOS Software Enterprises, Ltd.
+ - for Variable for No Answer Timeout for Attended Transfer
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt
Modified: team/jcollie/bug7131/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7131/UPGRADE.txt?rev=30386&r1=30385&r2=30386&view=diff
==============================================================================
--- team/jcollie/bug7131/UPGRADE.txt (original)
+++ team/jcollie/bug7131/UPGRADE.txt Thu May 25 15:08:59 2006
@@ -97,6 +97,12 @@
record conversations queue members are having with queue callers. Please
see configs/queues.conf.sample for more information on this option.
+* app_meetme: The 'm' option (monitor) is renamed to 'l' (listen only), and
+ the 'm' option now provides the functionality of "initially muted".
+ In practice, most existing dialplans using the 'm' flag should not notice
+ any difference, unless the keypad menu is enabled, allowing the user
+ to unmute themsleves.
+
* ast_play_and_record would attempt to cancel the recording if a DTMF
'0' was received. This behavior was not documented in most of the
applications that used ast_play_and_record and the return codes from
@@ -132,6 +138,12 @@
headers are not automatically sent, unless you specify them as separate
arguments. Please see the application help for the new syntax.
+* app_meetme: Mute and Unmute events are now reported via the Manager API.
+ Native Manager API commands MeetMeMute and MeetMeUnmute are provided, which
+ are easier to use than "Action Command:". The MeetMeStopTalking event has
+ also been deprecated in favor of the already existing MeetmeTalking event
+ with a "Status" of "on" or "off" added.
+
Variables:
* The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},
Modified: team/jcollie/bug7131/aclocal.m4
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7131/aclocal.m4?rev=30386&r1=30385&r2=30386&view=diff
==============================================================================
--- team/jcollie/bug7131/aclocal.m4 (original)
+++ team/jcollie/bug7131/aclocal.m4 Thu May 25 15:08:59 2006
@@ -1,14 +1,922 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_include([acinclude.m4])
+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+# AST_EXT_LIB([NAME], [FUNCTION], [package header], [package symbol name], [package friendly name], [additional LIB data])
+
+AC_DEFUN([AST_EXT_LIB],
+[
+AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use $5 files in PATH]),[
+case ${withval} in
+ n|no)
+ USE_$4=no
+ ;;
+ y|ye|yes)
+ $4_MANDATORY="yes"
+ ;;
+ *)
+ $4_DIR="${withval}"
+ $4_MANDATORY="yes"
+ ;;
+esac
+])
+
+PBX_LIB$4=0
+
+if test "${USE_$4}" != "no"; then
+ pbxlibdir=""
+ if test "x${$4_DIR}" != "x"; then
+ pbxlibdir="-L${$1_DIR}/lib"
+ fi
+ AC_CHECK_LIB([$1], [$2], [AST_$4_FOUND=yes], [AST_$4_FOUND=no], ${pbxlibdir} $6)
+
+ if test "${AST_$4_FOUND}" = "yes"; then
+ $4_LIB="-l$1 $6"
+ $4_HEADER_FOUND="1"
+ if test "x${$4_DIR}" != "x"; then
+ $4_LIB="${pbxlibdir} ${$4_LIB}"
+ $4_INCLUDE="-I${$4_DIR}/include"
+ if test "x$3" != "x" ; then
+ AC_CHECK_HEADER([${$4_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
+ fi
+ else
+ if test "x$3" != "x" ; then
+ AC_CHECK_HEADER([$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
+ fi
+ fi
+ if test "x${$4_HEADER_FOUND}" = "x0" ; then
+ if test ! -z "${$4_MANDATORY}" ;
+ then
+ echo " ***"
+ echo " *** It appears that you do not have the $1 development package installed."
+ echo " *** Please install it to include $5 support, or re-run configure"
+ echo " *** without explicitly specifying --with-$1"
+ exit 1
+ fi
+ $4_LIB=""
+ $4_INCLUDE=""
+ PBX_LIB$4=0
+ else
+ PBX_LIB$4=1
+ AC_DEFINE_UNQUOTED([HAVE_$4], 1, [Define to indicate the $5 library])
+ fi
+ elif test ! -z "${$4_MANDATORY}";
+ then
+ echo "***"
+ echo "*** The $5 installation on this system appears to be broken."
+ echo "*** Either correct the installation, or run configure"
+ echo "*** without explicity specifying --with-$1"
+ exit 1
+ fi
+fi
+AC_SUBST([$4_LIB])
+AC_SUBST([$4_INCLUDE])
+AC_SUBST([PBX_LIB$4])
+])
+
+
+AC_DEFUN(
+[AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
+ GNU_MAKE='Not Found' ;
+ for a in make gmake gnumake ; do
+ if test -z "$a" ; then continue ; fi ;
+ if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
+ GNU_MAKE=$a ;
+ break;
+ fi
+ done ;
+) ;
+if test "x$GNU_MAKE" = "xNot Found" ; then
+ echo " *** Please install GNU make. It is required to build Asterisk!"
+ exit 1
+fi
+AC_SUBST([GNU_MAKE])
+])
+
+# lib-prefix.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_LIB_ARG_WITH([lib-prefix],
+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+ --without-lib-prefix don't search for libraries in includedir and libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+])
+ if test $use_additional = yes; then
+ dnl Potentially add $additional_includedir to $CPPFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's already present in $CPPFLAGS,
+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ for x in $CPPFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ dnl Really add $additional_includedir to $CPPFLAGS.
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ dnl Potentially add $additional_libdir to $LDFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/lib,
+ dnl 2. if it's already present in $LDFLAGS,
+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ for x in $LDFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LDFLAGS.
+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+ dnl Unfortunately, prefix and exec_prefix get only finally determined
+ dnl at the end of configure.
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ $1
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+])
+
+# lib-link.m4 serial 6 (gettext-0.14.3)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ(2.50)
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+ define([Name],[translit([$1],[./-], [___])])
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+ ])
+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+ undefine([Name])
+ undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+ define([Name],[translit([$1],[./-], [___])])
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+ dnl because if the user has installed lib[]Name and not disabled its use
+ dnl via --without-lib[]Name-prefix, he wants to use it.
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIB[]NAME"
+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+ LIBS="$ac_save_LIBS"
+ ])
+ if test "$ac_cv_lib[]Name" = yes; then
+ HAVE_LIB[]NAME=yes
+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+ AC_MSG_CHECKING([how to link with lib[]$1])
+ AC_MSG_RESULT([$LIB[]NAME])
+ else
+ HAVE_LIB[]NAME=no
+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+ dnl $INC[]NAME either.
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LIB[]NAME=
+ LTLIB[]NAME=
+ fi
+ AC_SUBST([HAVE_LIB]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ undefine([Name])
+ undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+dnl hardcode_direct, hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+ dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+ ])
+ wl="$acl_cv_wl"
+ libext="$acl_cv_libext"
+ shlibext="$acl_cv_shlibext"
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ hardcode_direct="$acl_cv_hardcode_direct"
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ dnl Determine whether the user wants rpath handling at all.
+ AC_ARG_ENABLE(rpath,
+ [ --disable-rpath do not hardcode runtime library paths],
+ :, enable_rpath=yes)
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_LIB_ARG_WITH([lib$1-prefix],
+[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
+ --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+])
+ dnl Search the library and its dependencies in $additional_libdir and
+ dnl $LDFLAGS. Using breadth-first-seach.
+ LIB[]NAME=
+ LTLIB[]NAME=
+ INC[]NAME=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='$1 $2'
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+ dnl or AC_LIB_HAVE_LINKFLAGS call.
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+ else
+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+ dnl that this library doesn't exist. So just drop it.
+ :
+ fi
+ else
+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
[... 26614 lines stripped ...]
More information about the svn-commits
mailing list