[svn-commits] juggie: branch group/asterisk-addons-NoLossCDR-Redux2 r548 - /team/group/aste...

[SVN commits to the Digium repositories]

Author: juggie
Date: Tue Mar 11 14:35:34 2008
New Revision: 548

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=548
Log:
Merged revisions 545-546 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/trunk

................
r545 | tilghman | 2008-03-07 10:05:58 -0500 (Fri, 07 Mar 2008) | 10 lines

Blocked revisions 544 via svnmerge

........
r544 | tilghman | 2008-03-07 09:04:06 -0600 (Fri, 07 Mar 2008) | 3 lines

Fix documentation
(Closes issue #12166)

........

................
r546 | russell | 2008-03-11 12:19:30 -0400 (Tue, 11 Mar 2008) | 4 lines

check for a different function to ensure that the version of spandsp is new enough
(closes issue #12181)
(reported by adriavidal, patched by me)

................

Modified:
    team/group/asterisk-addons-NoLossCDR-Redux2/   (props changed)
    team/group/asterisk-addons-NoLossCDR-Redux2/configure
    team/group/asterisk-addons-NoLossCDR-Redux2/configure.ac

Propchange: team/group/asterisk-addons-NoLossCDR-Redux2/
------------------------------------------------------------------------------
--- branch-1.4-blocked (original)
+++ branch-1.4-blocked Tue Mar 11 14:35:34 2008
@@ -1,1 +1,1 @@
-/branches/1.4:385,439,462
+/branches/1.4:385,439,462,544

Propchange: team/group/asterisk-addons-NoLossCDR-Redux2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 11 14:35:34 2008
@@ -1,1 +1,1 @@
-/trunk:1-542
+/trunk:1-547

Modified: team/group/asterisk-addons-NoLossCDR-Redux2/configure.ac
URL: http://svn.digium.com/view/asterisk-addons/team/group/asterisk-addons-NoLossCDR-Redux2/configure.ac?view=diff&rev=548&r1=547&r2=548
==============================================================================
--- team/group/asterisk-addons-NoLossCDR-Redux2/configure.ac (original)
+++ team/group/asterisk-addons-NoLossCDR-Redux2/configure.ac Tue Mar 11 14:35:34 2008
@@ -180,7 +180,7 @@
 AST_EXT_LIB_CHECK([BLUETOOTH], [bluetooth], [ba2str], [bluetooth/bluetooth.h])
 AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
 AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
-AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [fax_init], [spandsp.h], [-ltiff])
+AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [span_set_message_handler], [spandsp.h], [-ltiff])
 
 AC_MSG_CHECKING(for -Wdeclaration-after-statement support)
 if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then