From 3f0d9eeed024fdfdfe20d1150ed339b721a410aa Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 27 Apr 2006 17:52:12 +0000 Subject: [PATCH] - add missing IXJUSER to menuselect-deps.in - don't check for a private function when looking for nbs - fix the path to ixjuser.h git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22904 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- build_tools/menuselect-deps.in | 2 +- configure.ac | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index a561f12bab..ba90e07edd 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -15,7 +15,6 @@ NBS=@PBX_LIBnbs@ 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 @@ WIN32=@OSISWIN32@ ZLIB=@PBX_LIBz@ ZAPTEL=@PBX_LIBtonezone@ LIBGSM=@PBX_LIBgsm@ +IXJUSER=@PBX_IXJUSER@ diff --git a/configure.ac b/configure.ac index 4fe2c1f6db..eea9178b46 100644 --- a/configure.ac +++ b/configure.ac @@ -160,7 +160,7 @@ AC_SUBST(AST_DEVMODE) 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 @@ PBX_H323=0 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