[asterisk-commits] branch bweschke/polycom_acd_functions r30988 - in
/team/bweschke/polycom_acd_...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed May 31 05:17:08 MST 2006
Author: bweschke
Date: Wed May 31 07:17:07 2006
New Revision: 30988
URL: http://svn.digium.com/view/asterisk?rev=30988&view=rev
Log:
Merged revisions 30409,30411,30426-30427,30430,30458,30463,30465,30490,30521,30547-30548,30578-30580,30603,30607,30630,30653-30655,30677,30699-30701,30723,30746,30771,30800,30803-30806,30835,30837,30847,30875,30906-30907,30934,30959 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r30409 | file | 2006-05-25 16:06:08 -0500 (Thu, 25 May 2006) | 2 lines
Remove possibility of sending duplicate MeetmeJoin manager events, and only send a MeetmeLeave event if a MeetmeJoin event occured in the first place. (issue #6599 reported by imran - provided patch with few tiny mods)
................
r30411 | tilghman | 2006-05-25 16:06:43 -0500 (Thu, 25 May 2006) | 2 lines
Deprecate SetCallerID (should have happened prior to release of 1.2)
................
r30426 | bweschke | 2006-05-25 16:24:12 -0500 (Thu, 25 May 2006) | 11 lines
Merged revisions 30424 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30424 | bweschke | 2006-05-25 17:22:16 -0400 (Thu, 25 May 2006) | 3 lines
Oops.
........
................
r30427 | file | 2006-05-25 16:30:40 -0500 (Thu, 25 May 2006) | 2 lines
Merge in branch that adds new features to MeetMeAdmin. See application documentation for more details on the new options. (issue #7131 reported by dmikusa branch by jcollie)
................
r30430 | bweschke | 2006-05-25 16:47:03 -0500 (Thu, 25 May 2006) | 3 lines
A new way to try and deal with deadlocks that occur in app_queue at present. Using this approach, we only manipulate the main queue mutexes when we get a dev state change on a device that is actually a member of a queue. Further optimizations are still possible (eg - store and manage pointers to the status integer of the member record that this interface/device has a one-to-one relationship with and then go directly to those pointers to make status modifications rather than the recursive looping that goes on now) BUT first things first. :)
................
r30458 | russell | 2006-05-25 17:05:12 -0500 (Thu, 25 May 2006) | 2 lines
restore default paths for FreeBSD (reported by alphaque, fixed by jcollie)
................
r30463 | russell | 2006-05-25 17:06:55 -0500 (Thu, 25 May 2006) | 2 lines
regenerate configure after the last fix
................
r30465 | russell | 2006-05-25 17:39:57 -0500 (Thu, 25 May 2006) | 2 lines
only display a debug message if option_debug is in use
................
r30490 | markster | 2006-05-25 22:08:15 -0500 (Thu, 25 May 2006) | 2 lines
Lets not commit things that cause Asterisk to break when config files aren't present.
................
r30521 | markster | 2006-05-26 00:21:41 -0500 (Fri, 26 May 2006) | 2 lines
That goes for jingle too :)
................
r30547 | file | 2006-05-26 12:43:11 -0500 (Fri, 26 May 2006) | 2 lines
Add the video stream for AGI function STREAM FILE (issue #5392 reported by areski -- minor mods by me)
................
r30548 | file | 2006-05-26 12:59:29 -0500 (Fri, 26 May 2006) | 2 lines
attended transfer use transferer context first and set who is transfering at the beginning (issue #6752 reported by moy -- minor mods done by myself)
................
r30578 | russell | 2006-05-26 13:19:37 -0500 (Fri, 26 May 2006) | 2 lines
add some more text about the build system
................
r30579 | russell | 2006-05-26 13:25:38 -0500 (Fri, 26 May 2006) | 2 lines
wrap test at 80 characters
................
r30580 | russell | 2006-05-26 13:33:58 -0500 (Fri, 26 May 2006) | 3 lines
document the changes I made yesterday to the exit behavior of the
AGI applications
................
r30603 | file | 2006-05-26 14:48:17 -0500 (Fri, 26 May 2006) | 2 lines
Add ability to disable log / verbose output to remote consoles (issue #6524 reported by mavetju)
................
r30607 | file | 2006-05-26 15:00:48 -0500 (Fri, 26 May 2006) | 2 lines
Few more expire_registry changes
................
r30630 | russell | 2006-05-26 16:47:52 -0500 (Fri, 26 May 2006) | 17 lines
Fix various problems in the addition of the ability to mute log/verbose
output to remove consoles. The prototypes added to logger.h still need
doxygen documentation, as well.
- Add the new command line option to the man page
- make the mute option a flag instead of an int since it is only a binary
option
- remove useless extern keywords for prototypes added to logger.h
- rename ast_console_mute() to ast_console_toggle_mute() since that is what
it actually does
- actually apply the mute option to newly created remote consoles instead of
only working when the CLI command is used
- don't imply the NO_FORK option if the mute command line option is provided
- place the new CLI command in the correct place in the list which has to be
in alphabetical order
- Finally, clean up a few spacing issues to conform to the coding guidelines
................
r30653 | tilghman | 2006-05-27 13:19:16 -0500 (Sat, 27 May 2006) | 2 lines
Should use the named handle, not one hardcoded
................
r30654 | tilghman | 2006-05-27 13:45:15 -0500 (Sat, 27 May 2006) | 2 lines
Notate that QUEUEAGENTCOUNT is deprecated, so it can be removed post-1.4
................
r30655 | russell | 2006-05-27 13:47:44 -0500 (Sat, 27 May 2006) | 1 line
make some variables static ... committed from xcode :)
................
r30677 | tilghman | 2006-05-28 10:10:19 -0500 (Sun, 28 May 2006) | 2 lines
Deprecate SetGlobalVar, replacing it with a dialplan function
................
r30699 | rizzo | 2006-05-29 00:13:13 -0500 (Mon, 29 May 2006) | 3 lines
this file contained the body twice, so remove the second instance.
................
r30700 | rizzo | 2006-05-29 00:14:52 -0500 (Mon, 29 May 2006) | 4 lines
remove an explicit constant;
add a comment on the need to sort patterns in the standard way.
................
r30701 | rizzo | 2006-05-29 00:23:59 -0500 (Mon, 29 May 2006) | 3 lines
remove unused include
................
r30723 | russell | 2006-05-29 09:52:55 -0500 (Mon, 29 May 2006) | 2 lines
remove duplicate static keywords, oops
................
r30746 | russell | 2006-05-30 06:23:48 -0500 (Tue, 30 May 2006) | 3 lines
remove a bunch of duplicated log messages. There is a warning that gets
logged when this function returns an error
................
r30771 | bweschke | 2006-05-30 09:59:02 -0500 (Tue, 30 May 2006) | 3 lines
It's a 1.2 'thang'.
................
r30800 | kpfleming | 2006-05-30 11:01:50 -0500 (Tue, 30 May 2006) | 2 lines
fix various typos and other bits (from Ian Kinner)
................
r30803 | kpfleming | 2006-05-30 11:08:38 -0500 (Tue, 30 May 2006) | 10 lines
Merged revisions 30802 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30802 | kpfleming | 2006-05-30 11:07:16 -0500 (Tue, 30 May 2006) | 2 lines
another S/390 build fix
........
................
r30804 | file | 2006-05-30 11:10:10 -0500 (Tue, 30 May 2006) | 2 lines
Be gone unused res! (issue #7238 reported by casper)
................
r30805 | file | 2006-05-30 11:23:34 -0500 (Tue, 30 May 2006) | 2 lines
Be gone foul Makefile usage! er I mean use the correct variable... UTILS instead of TARGET. (issue #7239 reported by casper)
................
r30806 | jcollie | 2006-05-30 11:36:21 -0500 (Tue, 30 May 2006) | 1 line
Get rid of warning about datarootdir at the end of the configure process...
................
r30835 | file | 2006-05-30 12:33:37 -0500 (Tue, 30 May 2006) | 2 lines
Remove ourselves from the userlist a little bit earlier
................
r30837 | kpfleming | 2006-05-30 12:52:49 -0500 (Tue, 30 May 2006) | 2 lines
officially deprecate the 'roundrobin' queue strategy in favor of 'rrmemory'
................
r30847 | kpfleming | 2006-05-30 13:01:52 -0500 (Tue, 30 May 2006) | 2 lines
when we receive an IAX2 registration request with both a plaintext secret and an MD5 challenge, prefer the MD5 challenge for authentation (reported on asterisk-dev)
................
r30875 | kpfleming | 2006-05-30 14:20:20 -0500 (Tue, 30 May 2006) | 10 lines
Merged revisions 30874 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30874 | kpfleming | 2006-05-30 14:18:30 -0500 (Tue, 30 May 2006) | 2 lines
check the proper variable...
........
................
r30906 | tilghman | 2006-05-30 15:24:40 -0500 (Tue, 30 May 2006) | 2 lines
Bug 7237 - Replace recoded thread_safe_rand with the existing ast_random API
................
r30907 | kpfleming | 2006-05-30 15:25:34 -0500 (Tue, 30 May 2006) | 2 lines
remove some files that don't actually get used by the code
................
r30934 | kpfleming | 2006-05-30 16:37:11 -0500 (Tue, 30 May 2006) | 3 lines
move processing of 'languageprefix' option to proper section of config file
document that option :-)
................
r30959 | file | 2006-05-30 17:11:34 -0500 (Tue, 30 May 2006) | 2 lines
Tiny documentation fix
................
Added:
team/bweschke/polycom_acd_functions/funcs/func_global.c (props changed)
- copied unchanged from r30959, trunk/funcs/func_global.c
Modified:
team/bweschke/polycom_acd_functions/ (props changed)
team/bweschke/polycom_acd_functions/Makefile
team/bweschke/polycom_acd_functions/UPGRADE.txt
team/bweschke/polycom_acd_functions/aclocal.m4
team/bweschke/polycom_acd_functions/apps/app_alarmreceiver.c
team/bweschke/polycom_acd_functions/apps/app_directory.c
team/bweschke/polycom_acd_functions/apps/app_disa.c
team/bweschke/polycom_acd_functions/apps/app_meetme.c
team/bweschke/polycom_acd_functions/apps/app_playback.c
team/bweschke/polycom_acd_functions/apps/app_queue.c
team/bweschke/polycom_acd_functions/apps/app_setcallerid.c
team/bweschke/polycom_acd_functions/apps/app_speech_utils.c
team/bweschke/polycom_acd_functions/apps/app_stack.c
team/bweschke/polycom_acd_functions/asterisk.8
team/bweschke/polycom_acd_functions/asterisk.c
team/bweschke/polycom_acd_functions/cdr/cdr_radius.c
team/bweschke/polycom_acd_functions/channels/chan_iax2.c
team/bweschke/polycom_acd_functions/channels/chan_jingle.c
team/bweschke/polycom_acd_functions/cli.c
team/bweschke/polycom_acd_functions/codecs/gsm/Makefile
team/bweschke/polycom_acd_functions/configs/voicemail.conf.sample
team/bweschke/polycom_acd_functions/configure
team/bweschke/polycom_acd_functions/configure.ac
team/bweschke/polycom_acd_functions/doc/asterisk-conf.txt
team/bweschke/polycom_acd_functions/doc/speechrec.txt
team/bweschke/polycom_acd_functions/funcs/func_odbc.c
team/bweschke/polycom_acd_functions/include/asterisk/logger.h
team/bweschke/polycom_acd_functions/include/asterisk/options.h
team/bweschke/polycom_acd_functions/logger.c
team/bweschke/polycom_acd_functions/makeopts.in
team/bweschke/polycom_acd_functions/pbx.c
team/bweschke/polycom_acd_functions/res/res_agi.c
team/bweschke/polycom_acd_functions/res/res_features.c
team/bweschke/polycom_acd_functions/res/res_jabber.c
team/bweschke/polycom_acd_functions/sounds.txt
team/bweschke/polycom_acd_functions/utils/Makefile
Propchange: team/bweschke/polycom_acd_functions/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/bweschke/polycom_acd_functions/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/bweschke/polycom_acd_functions/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 31 07:17:07 2006
@@ -1,1 +1,1 @@
-/trunk:1-30393
+/trunk:1-30987
Modified: team/bweschke/polycom_acd_functions/Makefile
URL: http://svn.digium.com/view/asterisk/team/bweschke/polycom_acd_functions/Makefile?rev=30988&r1=30987&r2=30988&view=diff
==============================================================================
--- team/bweschke/polycom_acd_functions/Makefile (original)
+++ team/bweschke/polycom_acd_functions/Makefile Wed May 31 07:17:07 2006
@@ -95,14 +95,18 @@
else
ASTETCDIR=$(sysconfdir)/asterisk
ASTLIBDIR=$(libdir)/asterisk
- ASTVARLIBDIR=$(localstatedir)/lib/asterisk
- ASTSPOOLDIR=$(localstatedir)/spool/asterisk
- ASTLOGDIR=$(localstatedir)/log/asterisk
ASTHEADERDIR=$(includedir)/asterisk
ASTBINDIR=$(bindir)
ASTSBINDIR=$(sbindir)
+ ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+ ASTLOGDIR=$(localstatedir)/log/asterisk
ASTVARRUNDIR=$(localstatedir)/run
ASTMANDIR=$(mandir)
+ifeq ($(OSARCH),FreeBSD)
+ ASTVARLIBDIR=$(prefix)/share/asterisk
+else
+ ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+endif
endif
ASTDATADIR?=$(ASTVARLIBDIR)
Modified: team/bweschke/polycom_acd_functions/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/bweschke/polycom_acd_functions/UPGRADE.txt?rev=30988&r1=30987&r2=30988&view=diff
==============================================================================
--- team/bweschke/polycom_acd_functions/UPGRADE.txt (original)
+++ team/bweschke/polycom_acd_functions/UPGRADE.txt Wed May 31 07:17:07 2006
@@ -14,30 +14,46 @@
be present, etc.
You must run the configure script before Asterisk will build, although it will
-attempt to automatically run it for you with no options specified; for most users,
-that will result in a similar build to what they would have had before the
-configure script was added to the build process (except for having to run 'make'
-again after the configure script is run). Note that the configure script does NOT
-need to be re-run just to rebuild Asterisk; you only need to re-run it when your
-system configuration changes or you wish to build Asterisk with different options.
+attempt to automatically run it for you with no options specified; for most
+users, that will result in a similar build to what they would have had before
+the configure script was added to the build process (except for having to run
+'make' again after the configure script is run). Note that the configure script
+does NOT need to be re-run just to rebuild Asterisk; you only need to re-run it
+when your system configuration changes or you wish to build Asterisk with
+different options.
Build Process (module selection):
The Asterisk source tree now includes a basic module selection and build option
selection tool called 'menuselect'. Run 'make menuselect' to make your choices.
In this tool, you can disable building of modules that you don't care about,
-turn on/off global options for the build and see which modules will not (and cannot)
-be built because your system does not have the required external dependencies
-installed.
-
-(TODO: document where 'global' and 'per-user' menuselect input files should go
-and what they need to contain)
+turn on/off global options for the build and see which modules will not
+(and cannot) be built because your system does not have the required external
+dependencies installed.
+
+The resulting file from menuselect is called 'menuselect.makeopts'. Note that
+the resulting menuselect.makeopts file generally contains which modules *not*
+to build. The modules listed in this file indicate which modules have unmet
+dependencies, a present conflict, or have been disabled by the user in the
+menuselect interface. Compiler Flags can also be set in the menuselect
+interface. In this case, the resulting file contains which CFLAGS are in use,
+not which ones are not in use.
+
+If you would like to save your choices and have them applied against all
+builds, the file can be copied to '~/.asterisk.makeopts' or
+'/etc/asterisk.makeopts'.
PBX Core:
* The (very old and undocumented) ability to use BYEXTENSION for dialing
instead of ${EXTEN} has been removed.
-
+
+* Builtin (res_features) transfer functionality attempts to use the context
+ defined in TRANSFER_CONTEXT variable of the transferer channel first. If
+ not set, it uses the transferee variable. If not set in any channel, it will
+ attempt to use the last non macro context. If not possible, it will default
+ to the current context.
+
Command Line Interface:
* 'show channels concise', designed to be used by applications that will parse
@@ -58,6 +74,12 @@
and GetGroupMatchCount were all deprecated in version 1.2, and therefore have
been removed in this version. You should use the equivalent dialplan
function in places where you have previously used one of these applications.
+
+* The application SetGlobalVar has been deprecated. You should replace uses
+ of this application with the following combination of Set and GLOBAL():
+ Set(GLOBAL(name)=value). You may also access global variables exclusively by
+ using the GLOBAL() dialplan function, instead of relying on variable
+ interpolation falling back to globals when no channel variable is set.
* The application SetVar has been renamed to Set. The syntax SetVar was marked
deprecated in version 1.2 and is no longer recognized in this version.
@@ -97,6 +119,11 @@
record conversations queue members are having with queue callers. Please
see configs/queues.conf.sample for more information on this option.
+* The app_queue application strategy called 'roundrobin' has been deprecated
+ for this release. Users are encouraged to use 'rrmemory' instead, since it
+ provides more 'true' round-robin call delivery. For the Asterisk 1.6 release,
+ 'rrmemory' will be renamed 'roundrobin'.
+
* 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
@@ -119,6 +146,24 @@
This addresses the deficiency of not being able to count the number of
messages in folders other than INBOX and Old.
+* The exit behavior of the AGI applications has changed. Previously, when
+ a connection to an AGI server failed, the application would cause the channel
+ to immediately stop dialplan execution and hangup. Now, the only time that
+ the AGI applications will cause the channel to stop dialplan execution is
+ when the channel itself requests hangup. The AGI applications now set an
+ AGISTATUS variable which will allow you to find out whether running the AGI
+ was successful or not.
+
+ Previously, there was no way to handle the case where Asterisk was unable to
+ locally execute an AGI script for some reason. In this case, dialplan
+ execution will continue as it did before, but the AGISTATUS variable will be
+ set to "FAILURE".
+
+ A locally executed AGI script can now exit with a non-zero exit code and this
+ failure will be detected by Asterisk. If an AGI script exits with a non-zero
+ exit code, the AGISTATUS variable will be set to "FAILURE" as opposed to
+ "SUCCESS".
+
Manager:
* After executing the 'status' manager action, the "Status" manager events
@@ -158,6 +203,9 @@
* OSP applications exports several new variables, ${OSPINHANDLE},
${OSPOUTHANDLE}, ${OSPINTOKEN}, ${OSPOUTTOKEN}, ${OSPCALLING},
${OSPINTIMELIMIT}, and ${OSPOUTTIMELIMIT}
+
+* Builtin transfer functionality sets the variable ${TRANSFERERNAME} in the new
+ created channel. This variables holds the channel name of the transferer.
Functions:
@@ -169,13 +217,17 @@
modules.conf file then you will need to explicitly load the modules that
contain the functions you want to use.
-* The ENUMLOOKUP() function with the 'c' option (for counting the number of records),
- but the lookup fails to match any records, the returned value will now be "0" instead of blank.
+* The ENUMLOOKUP() function with the 'c' option (for counting the number of
+ records), but the lookup fails to match any records, the returned value will
+ now be "0" instead of blank.
* The REALTIME() function is now available in version 1.4 and app_realtime has
been deprecated in favor of the new function. app_realtime will be removed
completely with the version 1.6 release so please take the time between
releases to make any necessary changes
+
+* The QUEUEAGENTCOUNT() function has been deprecated in favor of
+ QUEUE_MEMBER_COUNT().
The IAX2 channel:
@@ -188,7 +240,8 @@
The SIP channel:
-* The "incominglimit" setting is replaced by the "call-limit" setting in sip.conf.
+* The "incominglimit" setting is replaced by the "call-limit" setting in
+ sip.conf.
* OSP support code is removed from SIP channel to OSP applications. ospauth
option in sip.conf is removed to osp.conf as authpolicy. allowguest option
@@ -196,13 +249,17 @@
The Zap channel:
-* Support for MFC/R2 has been removed, as it has not been functional for some time
- and it has no maintainer.
+* Support for MFC/R2 has been removed, as it has not been functional for some
+ time and it has no maintainer.
Installation:
-* On BSD systems, the installation directories have changed to more "FreeBSDish" directories. On startup, Asterisk will look for the main configuration in /usr/local/etc/asterisk/asterisk.conf
-If you have an old installation, you might want to remove the binaries and move the configuration files to the new locations. The following directories are now default:
+* On BSD systems, the installation directories have changed to more "FreeBSDish"
+ directories. On startup, Asterisk will look for the main configuration in
+ /usr/local/etc/asterisk/asterisk.conf
+ If you have an old installation, you might want to remove the binaries and
+ move the configuration files to the new locations. The following directories
+ are now default:
ASTLIBDIR /usr/local/lib/asterisk
ASTVARLIBDIR /usr/local/share/asterisk
ASTETCDIR /usr/local/etc/asterisk
@@ -211,8 +268,8 @@
Sounds:
-* The phonetic sounds directory has been removed from the asterisk-sounds package
- because they are now included directly in Asterisk. However, it is important to
- note that the phonetic sounds that existed in asterisk-sounds used a different
- naming convention than the sounds in Asterisk. For example, instead of alpha.gsm
- and bravo.gsm, Asterisk has a_p.gsm and b_p.gsm.
+* The phonetic sounds directory has been removed from the asterisk-sounds
+ package because they are now included directly in Asterisk. However, it is
+ important to note that the phonetic sounds that existed in asterisk-sounds
+ used a different naming convention than the sounds in Asterisk. For example,
+ instead of alpha.gsm and bravo.gsm, Asterisk has a_p.gsm and b_p.gsm.
Modified: team/bweschke/polycom_acd_functions/aclocal.m4
URL: http://svn.digium.com/view/asterisk/team/bweschke/polycom_acd_functions/aclocal.m4?rev=30988&r1=30987&r2=30988&view=diff
==============================================================================
--- team/bweschke/polycom_acd_functions/aclocal.m4 (original)
+++ team/bweschke/polycom_acd_functions/aclocal.m4 Wed May 31 07:17:07 2006
@@ -1,922 +1,14 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-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.
+# 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.
-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.
+# 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.
-# 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.
- :
[... 2064 lines stripped ...]
More information about the asterisk-commits
mailing list