[svn-commits] branch north/chan_skinny-fixup r29611 - in
/team/north/chan_skinny-fixup: ./ ...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Mon May 22 16:57:39 MST 2006
Author: north
Date: Mon May 22 18:57:39 2006
New Revision: 29611
URL: http://svn.digium.com/view/asterisk?rev=29611&view=rev
Log:
Merged revisions 29017-29018,29053,29094-29095,29129,29164,29195,29197,29234,29264-29268,29298-29299,29315,29328-29335,29363-29364,29395,29407,29411,29434-29435,29463,29465-29467,29514,29553-29554,29556,29570,29592 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r29017 | russell | 2006-05-20 06:29:22 -0700 (Sat, 20 May 2006) | 6 lines
- add a UserEvent action that allows a manager client to "broadcast" an event
to all connected manager clients
- update the UserEvent application to use the application argument parsing
macros and to allow headers to be specified as pipe delimeted arguments
(issue #5324, original patch by outtolunc, committed patch by Corydon)
................
r29018 | russell | 2006-05-20 06:37:11 -0700 (Sat, 20 May 2006) | 3 lines
add some code optimizations, see the report for an explanation
(issue #7105, Mithraen)
................
r29053 | russell | 2006-05-20 12:54:14 -0700 (Sat, 20 May 2006) | 3 lines
fix the possibility of writing one byte past the end of a buffer.
(issue #7189, Mithraen)
................
r29094 | russell | 2006-05-20 15:30:05 -0700 (Sat, 20 May 2006) | 5 lines
Add support for logging CDR recrods to a radius server (issue #6639, phsultan)
- with contributions from miconda, jcollie, and sb
- branch maintained by oej
Thanks everyone!
................
r29095 | russell | 2006-05-20 15:37:18 -0700 (Sat, 20 May 2006) | 2 lines
remove unused variable
................
r29129 | rizzo | 2006-05-21 02:56:38 -0700 (Sun, 21 May 2006) | 4 lines
remove an unused variable, and while at it
add some very minor optimizations.
................
r29164 | russell | 2006-05-21 07:06:37 -0700 (Sun, 21 May 2006) | 2 lines
remove a CLI command that has been marked deprecated since before Asterisk 1.0
................
r29195 | russell | 2006-05-21 08:13:19 -0700 (Sun, 21 May 2006) | 2 lines
put a bunch of defines in enums, and convert comments to doxygen format
................
r29197 | bweschke | 2006-05-21 08:25:31 -0700 (Sun, 21 May 2006) | 11 lines
Merged revisions 29196 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29196 | bweschke | 2006-05-21 10:16:59 -0500 (Sun, 21 May 2006) | 3 lines
When an application that is executed via applicationmap and exits non-zero, make sure that we pass through the correct return value from the application to make sure a segfault doesn't occur by a bridge trying to continue when it should not. Also, when executing applications via applicationmap, make sure that the application is executed against the channel whose DTMF caused it to be fired off in the first place. (part 1/2 of #7090 - this is the only fix that will be applied to both 1.2 and /trunk) acunningham and blitzrage on testing...
........
................
r29234 | rizzo | 2006-05-21 16:54:28 -0700 (Sun, 21 May 2006) | 4 lines
strcmp() is the right function to use here, not strncmp().
On passing simplify an ast_cli message nearby.
................
r29264 | rizzo | 2006-05-21 17:07:48 -0700 (Sun, 21 May 2006) | 5 lines
simplify logic in realtime_peer(), removing an unnecessary
initialization, an extra variable (newpeername) and a
variable newpeername, and an 'else' branch.
................
r29265 | rizzo | 2006-05-21 17:17:46 -0700 (Sun, 21 May 2006) | 3 lines
simplify logic in function create_addr()
................
r29266 | rizzo | 2006-05-21 17:29:12 -0700 (Sun, 21 May 2006) | 3 lines
minor logic simplification in get_sip_pvt_byid_locked()
................
r29267 | rizzo | 2006-05-21 17:32:36 -0700 (Sun, 21 May 2006) | 3 lines
src is const in parse_copy()
................
r29268 | rizzo | 2006-05-21 17:46:04 -0700 (Sun, 21 May 2006) | 3 lines
annotate const parameters of copy_header()
................
r29298 | rizzo | 2006-05-21 18:08:41 -0700 (Sun, 21 May 2006) | 4 lines
use a more compact method to trim the trailing ;... from SIP lines.
These are just the first two instances, there are many more to replace.
................
r29299 | rizzo | 2006-05-21 18:27:52 -0700 (Sun, 21 May 2006) | 6 lines
use strsep() to trim away ;xxx from SIP messages.
Note that in a couple of places the code overwrites the string
in the buffer - mark the two places with XXX but do not fix the
bug yet.
................
r29315 | rizzo | 2006-05-21 19:02:57 -0700 (Sun, 21 May 2006) | 3 lines
simplify register_peer_exten() removing some duplicated code.
................
r29328 | rizzo | 2006-05-21 19:16:04 -0700 (Sun, 21 May 2006) | 3 lines
fix indentation to make a table more readable
................
r29329 | rizzo | 2006-05-21 19:17:52 -0700 (Sun, 21 May 2006) | 3 lines
mark const the source of copy_request
................
r29330 | rizzo | 2006-05-21 19:19:14 -0700 (Sun, 21 May 2006) | 3 lines
mark const the 'header' argument of gettag
................
r29331 | rizzo | 2006-05-21 19:22:39 -0700 (Sun, 21 May 2006) | 3 lines
the msg argument of the various transmi_response*() functions is const.
................
r29332 | rizzo | 2006-05-21 19:27:33 -0700 (Sun, 21 May 2006) | 5 lines
various constification of function arguments to prevent erroneous
usage and to ease understanding of the function themselves.
................
r29333 | rizzo | 2006-05-21 19:31:58 -0700 (Sun, 21 May 2006) | 3 lines
more constifications
................
r29334 | rizzo | 2006-05-21 19:43:24 -0700 (Sun, 21 May 2006) | 4 lines
use the functional form of time(), and mark XXX a couple of places
with dubious assignments.
................
r29335 | rizzo | 2006-05-21 19:51:04 -0700 (Sun, 21 May 2006) | 3 lines
use functional form of time()
................
r29363 | rizzo | 2006-05-21 20:16:38 -0700 (Sun, 21 May 2006) | 3 lines
remove code duplication generating some ast_verbose messages .
................
r29364 | tilghman | 2006-05-21 20:40:31 -0700 (Sun, 21 May 2006) | 2 lines
Escaping commas within fields isn't always desireable.
................
r29395 | tilghman | 2006-05-22 07:39:10 -0700 (Mon, 22 May 2006) | 9 lines
Blocked revisions 29394 via svnmerge
........
r29394 | tilghman | 2006-05-22 09:34:34 -0500 (Mon, 22 May 2006) | 2 lines
Bug 7196 - month range did not work
........
................
r29407 | tilghman | 2006-05-22 08:01:36 -0700 (Mon, 22 May 2006) | 10 lines
Merged revisions 29398 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29398 | tilghman | 2006-05-22 09:59:59 -0500 (Mon, 22 May 2006) | 2 lines
Bug 7194 - spelling fix
........
................
r29411 | crichter | 2006-05-22 08:02:03 -0700 (Mon, 22 May 2006) | 1 line
added callcounters for incoming and outgoing calls
................
r29434 | bweschke | 2006-05-22 08:28:28 -0700 (Mon, 22 May 2006) | 3 lines
Add UniqueID to the leave manager event.
................
r29435 | file | 2006-05-22 08:48:22 -0700 (Mon, 22 May 2006) | 2 lines
don't stop recording until hangup (no terminator) (issue #7168 reported by julien23)
................
r29463 | file | 2006-05-22 09:08:23 -0700 (Mon, 22 May 2006) | 2 lines
Add PICKUPMARK support to app_directed_pickup (issue #7104 reported by thaeger)
................
r29465 | russell | 2006-05-22 09:34:45 -0700 (Mon, 22 May 2006) | 2 lines
add DEBUG_CHANNEL_LOCKS to menuselect
................
r29466 | file | 2006-05-22 09:36:13 -0700 (Mon, 22 May 2006) | 10 lines
Merged revisions 29464 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29464 | file | 2006-05-22 13:33:03 -0300 (Mon, 22 May 2006) | 2 lines
Preserve presentation bit when going through chan_local (issue #7002 reported by acunningham)
........
................
r29467 | bweschke | 2006-05-22 09:43:43 -0700 (Mon, 22 May 2006) | 3 lines
This is part 2/2 of the patches for #7090. Adds one-step call parking to /trunk via builtin functions and 'k' 'K' application options added to app_dial. This also resolves #6340.
................
r29514 | file | 2006-05-22 13:19:00 -0700 (Mon, 22 May 2006) | 10 lines
Merged revisions 29512 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29512 | file | 2006-05-22 17:15:04 -0300 (Mon, 22 May 2006) | 2 lines
Use the correct language when playing the transfer sound (issue #7109 reported by casper)
........
................
r29553 | mogorman | 2006-05-22 14:12:30 -0700 (Mon, 22 May 2006) | 1 line
asterisk-xmpp merge in
................
r29554 | kpfleming | 2006-05-22 14:20:01 -0700 (Mon, 22 May 2006) | 2 lines
bootstrap updates to include xmpp related stuff
................
r29556 | file | 2006-05-22 14:28:32 -0700 (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 15:02:38 -0700 (Mon, 22 May 2006) | 2 lines
remove properties from the xmpp merge
................
r29592 | mogorman | 2006-05-22 15:51:56 -0700 (Mon, 22 May 2006) | 3 lines
patch from bug 0007204 to make bug 5750 follow standard
manager naming convention.
................
Added:
team/north/chan_skinny-fixup/cdr/cdr_radius.c
- copied unchanged from r29592, trunk/cdr/cdr_radius.c
team/north/chan_skinny-fixup/channels/chan_jingle.c
- copied unchanged from r29592, trunk/channels/chan_jingle.c
team/north/chan_skinny-fixup/configs/jabber.conf.sample
- copied unchanged from r29592, trunk/configs/jabber.conf.sample
team/north/chan_skinny-fixup/configs/jingle.conf.sample
- copied unchanged from r29592, trunk/configs/jingle.conf.sample
team/north/chan_skinny-fixup/contrib/dictionary.digium
- copied unchanged from r29592, trunk/contrib/dictionary.digium
team/north/chan_skinny-fixup/doc/jabber.txt
- copied unchanged from r29592, trunk/doc/jabber.txt
team/north/chan_skinny-fixup/doc/jingle.txt
- copied unchanged from r29592, trunk/doc/jingle.txt
team/north/chan_skinny-fixup/doc/radius.txt
- copied unchanged from r29592, trunk/doc/radius.txt
team/north/chan_skinny-fixup/include/asterisk/jabber.h
- copied unchanged from r29592, trunk/include/asterisk/jabber.h
team/north/chan_skinny-fixup/include/asterisk/jingle.h
- copied unchanged from r29592, trunk/include/asterisk/jingle.h
team/north/chan_skinny-fixup/res/res_jabber.c
- copied unchanged from r29592, trunk/res/res_jabber.c
Modified:
team/north/chan_skinny-fixup/ (props changed)
team/north/chan_skinny-fixup/CREDITS
team/north/chan_skinny-fixup/UPGRADE.txt
team/north/chan_skinny-fixup/acinclude.m4
team/north/chan_skinny-fixup/aclocal.m4
team/north/chan_skinny-fixup/app.c
team/north/chan_skinny-fixup/apps/app_dial.c
team/north/chan_skinny-fixup/apps/app_directed_pickup.c
team/north/chan_skinny-fixup/apps/app_meetme.c
team/north/chan_skinny-fixup/apps/app_queue.c
team/north/chan_skinny-fixup/apps/app_record.c
team/north/chan_skinny-fixup/apps/app_userevent.c
team/north/chan_skinny-fixup/apps/app_waitforsilence.c
team/north/chan_skinny-fixup/build_tools/cflags.xml
team/north/chan_skinny-fixup/build_tools/menuselect-deps.in
team/north/chan_skinny-fixup/cdr/Makefile
team/north/chan_skinny-fixup/channels/Makefile
team/north/chan_skinny-fixup/channels/chan_local.c
team/north/chan_skinny-fixup/channels/chan_misdn.c
team/north/chan_skinny-fixup/channels/chan_sip.c
team/north/chan_skinny-fixup/channels/misdn/chan_misdn_config.h
team/north/chan_skinny-fixup/channels/misdn_config.c
team/north/chan_skinny-fixup/codecs/codec_a_mu.c
team/north/chan_skinny-fixup/codecs/codec_adpcm.c
team/north/chan_skinny-fixup/codecs/codec_alaw.c
team/north/chan_skinny-fixup/codecs/codec_ulaw.c
team/north/chan_skinny-fixup/configs/cdr.conf.sample
team/north/chan_skinny-fixup/configs/extensions.conf.sample
team/north/chan_skinny-fixup/configs/features.conf.sample
team/north/chan_skinny-fixup/configs/func_odbc.conf.sample
team/north/chan_skinny-fixup/configs/misdn.conf.sample
team/north/chan_skinny-fixup/configure
team/north/chan_skinny-fixup/configure.ac
team/north/chan_skinny-fixup/doc/cdrdriver.txt
team/north/chan_skinny-fixup/funcs/func_odbc.c
team/north/chan_skinny-fixup/include/asterisk/channel.h
team/north/chan_skinny-fixup/include/autoconfig.h.in
team/north/chan_skinny-fixup/makeopts.in
team/north/chan_skinny-fixup/manager.c
team/north/chan_skinny-fixup/res/Makefile
team/north/chan_skinny-fixup/res/res_features.c
Propchange: team/north/chan_skinny-fixup/
------------------------------------------------------------------------------
automerge = *
Propchange: team/north/chan_skinny-fixup/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/north/chan_skinny-fixup/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/north/chan_skinny-fixup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May 22 18:57:39 2006
@@ -1,1 +1,1 @@
-/trunk:1-28989
+/trunk:1-29610
Modified: team/north/chan_skinny-fixup/CREDITS
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/CREDITS?rev=29611&r1=29610&r2=29611&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/CREDITS (original)
+++ team/north/chan_skinny-fixup/CREDITS Mon May 22 18:57:39 2006
@@ -92,8 +92,9 @@
Music provided by www.freeplaymusic.com
=== OTHER SOURCE CODE IN ASTERISK ===
-Asterisk uses libedit, the lightweight readline replacement from
-NetBSD. It is BSD-licensed and requires the following statement:
+Asterisk uses libedit, the lightweight readline replacement from NetBSD.
+The cdr_radius module uses libradiusclient-ng, which is also from NetBSD.
+They are BSD-licensed and require the following statement:
This product includes software developed by the NetBSD
Foundation, Inc. and its contributors.
Modified: team/north/chan_skinny-fixup/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/UPGRADE.txt?rev=29611&r1=29610&r2=29611&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/UPGRADE.txt (original)
+++ team/north/chan_skinny-fixup/UPGRADE.txt Mon May 22 18:57:39 2006
@@ -127,6 +127,11 @@
call. This is useful when trying to link recording filenames back to
a particular call from the queue.
+* app_userevent has been modified to always send Event: UserEvent with the
+ additional header UserEvent: <userspec>. Also, the Channel and UniqueID
+ headers are not automatically sent, unless you specify them as separate
+ arguments. Please see the application help for the new syntax.
+
Variables:
* The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},
Modified: team/north/chan_skinny-fixup/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/acinclude.m4?rev=29611&r1=29610&r2=29611&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/acinclude.m4 (original)
+++ team/north/chan_skinny-fixup/acinclude.m4 Mon May 22 18:57:39 2006
@@ -5,35 +5,35 @@
AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use $5 files in PATH]),[
case ${withval} in
n|no)
- USE_$1=no
+ USE_$4=no
;;
y|ye|yes)
- $1_MANDATORY="yes"
+ $4_MANDATORY="yes"
;;
*)
- $1_DIR="${withval}"
- $1_MANDATORY="yes"
+ $4_DIR="${withval}"
+ $4_MANDATORY="yes"
;;
esac
])
-PBX_LIB$1=0
+PBX_LIB$4=0
-if test "${USE_$1}" != "no"; then
+if test "${USE_$4}" != "no"; then
pbxlibdir=""
- if test "x${$1_DIR}" != "x"; then
+ if test "x${$4_DIR}" != "x"; then
pbxlibdir="-L${$1_DIR}/lib"
fi
- AC_CHECK_LIB([$1], [$2], [:], [], ${pbxlibdir} $6)
+ AC_CHECK_LIB([$1], [$2], [AST_$4_FOUND=yes], [AST_$4_FOUND=no], ${pbxlibdir} $6)
- if test "${ac_cv_lib_$1_$2}" = "yes"; then
- $1_LIB="-l$1 $6"
+ if test "${AST_$4_FOUND}" = "yes"; then
+ $4_LIB="-l$1 $6"
$4_HEADER_FOUND="1"
- if test "x${$1_DIR}" != "x"; then
- $1_LIB="${pbxlibdir} ${$1_LIB}"
- $1_INCLUDE="-I${$1_DIR}/include"
+ 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([${$1_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
+ AC_CHECK_HEADER([${$4_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
fi
else
if test "x$3" != "x" ; then
@@ -41,7 +41,7 @@
fi
fi
if test "x${$4_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${$1_MANDATORY}" ;
+ if test ! -z "${$4_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the $1 development package installed."
@@ -49,14 +49,14 @@
echo " *** without explicitly specifying --with-$1"
exit 1
fi
- $1_LIB=""
- $1_INCLUDE=""
- PBX_LIB$1=0
+ $4_LIB=""
+ $4_INCLUDE=""
+ PBX_LIB$4=0
else
- PBX_LIB$1=1
+ PBX_LIB$4=1
AC_DEFINE_UNQUOTED([HAVE_$4], 1, [Define to indicate the $5 library])
fi
- elif test ! -z "${$1_MANDATORY}";
+ elif test ! -z "${$4_MANDATORY}";
then
echo "***"
echo "*** The $5 installation on this system appears to be broken."
@@ -65,9 +65,9 @@
exit 1
fi
fi
-AC_SUBST([$1_LIB])
-AC_SUBST([$1_INCLUDE])
-AC_SUBST([PBX_LIB$1])
+AC_SUBST([$4_LIB])
+AC_SUBST([$4_INCLUDE])
+AC_SUBST([PBX_LIB$4])
])
Modified: team/north/chan_skinny-fixup/aclocal.m4
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/aclocal.m4?rev=29611&r1=29610&r2=29611&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/aclocal.m4 (original)
+++ team/north/chan_skinny-fixup/aclocal.m4 Mon May 22 18:57:39 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
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ if test $use_additional = yes; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_dir="$additional_libdir"
+ found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ found_dir="$dir"
+ found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ dnl Found the library.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+ if test "$hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+ dnl resulting binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
[... 25024 lines stripped ...]
More information about the svn-commits
mailing list