[asterisk-commits] trunk r22904 - in /trunk: build_tools/menuselect-deps.in configure.ac

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Apr 27 12:52:12 2006
New Revision: 22904

URL: http://svn.digium.com/view/asterisk?rev=22904&view=rev
Log:
- add missing IXJUSER to menuselect-deps.in
- don't check for a private function when looking for nbs
- fix the path to ixjuser.h

Modified:
    trunk/build_tools/menuselect-deps.in
    trunk/configure.ac

Modified: trunk/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/menuselect-deps.in?rev=22904&r1=22903&r2=22904&view=diff
==============================================================================
--- trunk/build_tools/menuselect-deps.in (original)
+++ trunk/build_tools/menuselect-deps.in Thu Apr 27 12:52:12 2006
@@ -15,7 +15,6 @@
 OGG=@PBX_LIBogg@
 OSSAUDIO=@PBX_LIBossaudio@
 PGSQL=@PBX_LIBpq@
-PTLIB=@PBX_LIBPWLIB@
 QT=@PBX_QT@
 SQLITE=@PBX_LIBsqlite@
 SSL=@PBX_LIBssl@
@@ -25,3 +24,4 @@
 ZLIB=@PBX_LIBz@
 ZAPTEL=@PBX_LIBtonezone@
 LIBGSM=@PBX_LIBgsm@
+IXJUSER=@PBX_IXJUSER@

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=22904&r1=22903&r2=22904&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Apr 27 12:52:12 2006
@@ -160,7 +160,7 @@
 AST_EXT_LIB([asound], [snd_spcm_init], [alsa/asoundlib.h], [ALSA], [Advanced Linux Sound Architecture], [-lm -ldl])
 AST_EXT_LIB([curses], [initscr], [curses.h], [CURSES], [curses], [])
 AST_EXT_LIB([mfcr2], [mfcr2_MakeCall], [libmfcr2.h], [MFCR2], [MFCR2])
-AST_EXT_LIB([nbs], [nbs_setup], [nbs.h], [NBS], [Network Broadcast Sound])
+AST_EXT_LIB([nbs], [nbs_connect], [nbs.h], [NBS], [Network Broadcast Sound])
 AST_EXT_LIB([ncurses], [initscr], [curses.h], [NCURSES], [ncurses], [])
 AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
 AST_EXT_LIB([odbc], [SQLConnect], [sql.h], [UNIXODBC], [unixODBC])
@@ -302,9 +302,8 @@
 AC_CHECK_HEADER([h323.h], [PBX_H323=1], [])
 AC_SUBST(PBX_H323)
 
-HAVE_QUICKNET=0
-AC_CHECK_HEADER([ixjuser.h], [HAVE_QUICKNET=1],[])
-AC_SUBST(HAVE_QUICKNET)
+AC_CHECK_HEADER([linux/ixjuser.h], [PBX_IXJUSER=1],[PBX_IXJUSER=0])
+AC_SUBST(PBX_IXJUSER)
 
 AC_ARG_WITH([vpb], AC_HELP_STRING([--with-vpb=PATH],[use vpb files in PATH]),[
 case ${withval} in