[svn-commits] russell: branch 1.6.0 r616 - in /branches/1.6.0: ./ apps/ build_tools/

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Jun  2 11:16:10 2008
New Revision: 616

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

........
r615 | russell | 2008-06-02 11:15:45 -0500 (Mon, 02 Jun 2008) | 2 lines

Remove app_fax, as it has been moved into the main Asterisk repository

........

Removed:
    branches/1.6.0/apps/app_fax.c
Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/build_tools/menuselect-deps.in
    branches/1.6.0/configure.ac
    branches/1.6.0/makeopts.in

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Mon Jun  2 11:16:10 2008
@@ -1,1 +1,1 @@
-/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612
+/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615

Modified: branches/1.6.0/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk-addons/branches/1.6.0/build_tools/menuselect-deps.in?view=diff&rev=616&r1=615&r2=616
==============================================================================
--- branches/1.6.0/build_tools/menuselect-deps.in (original)
+++ branches/1.6.0/build_tools/menuselect-deps.in Mon Jun  2 11:16:10 2008
@@ -1,4 +1,3 @@
 BLUETOOTH=@PBX_BLUETOOTH@
 MYSQLCLIENT=@PBX_MYSQLCLIENT@
 ASTERISK=@PBX_ASTERISK@
-SPANDSP=@PBX_SPANDSP@

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk-addons/branches/1.6.0/configure.ac?view=diff&rev=616&r1=615&r2=616
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Mon Jun  2 11:16:10 2008
@@ -175,12 +175,10 @@
 AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])
 AST_EXT_LIB_SETUP([MYSQLCLIENT], [mysqlclient], [mysqlclient])
 AST_EXT_LIB_SETUP([ASTERISK], [asterisk], [asterisk])
-AST_EXT_LIB_SETUP([SPANDSP], [spandsp Library], [spandsp])
 
 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], [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

Modified: branches/1.6.0/makeopts.in
URL: http://svn.digium.com/view/asterisk-addons/branches/1.6.0/makeopts.in?view=diff&rev=616&r1=615&r2=616
==============================================================================
--- branches/1.6.0/makeopts.in (original)
+++ branches/1.6.0/makeopts.in Mon Jun  2 11:16:10 2008
@@ -50,6 +50,3 @@
 
 NCURSES_LIB=@NCURSES_LIB@
 NCURSES_INCLUDE=@NCURSES_INCLUDE@
-
-SPANDSP_INCLUDE=@SPANDSP_INCLUDE@
-SPANDSP_LIB=@SPANDSP_LIB@