kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

- add missing IXJUSER to menuselect-deps.in

Browse Source 
- 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
This commit is contained in:
Russell Bryant
2006-04-27 17:52:12 +00:00
parent 776a3da1a7
commit 3f0d9eeed0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_tools/menuselect-deps.in
View File

@@ -15,7 +15,6 @@ NBS=@PBX_LIBnbs@
OGG=@PBX_LIBogg@ OGG=@PBX_LIBogg@
OSSAUDIO=@PBX_LIBossaudio@ OSSAUDIO=@PBX_LIBossaudio@
PGSQL=@PBX_LIBpq@ PGSQL=@PBX_LIBpq@
PTLIB=@PBX_LIBPWLIB@
QT=@PBX_QT@ QT=@PBX_QT@
SQLITE=@PBX_LIBsqlite@ SQLITE=@PBX_LIBsqlite@
SSL=@PBX_LIBssl@ SSL=@PBX_LIBssl@
@@ -25,3 +24,4 @@ WIN32=@OSISWIN32@
ZLIB=@PBX_LIBz@ ZLIB=@PBX_LIBz@
ZAPTEL=@PBX_LIBtonezone@ ZAPTEL=@PBX_LIBtonezone@
LIBGSM=@PBX_LIBgsm@ LIBGSM=@PBX_LIBgsm@
IXJUSER=@PBX_IXJUSER@

7
configure.ac
View File

@@ -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([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([curses], [initscr], [curses.h], [CURSES], [curses], [])
AST_EXT_LIB([mfcr2], [mfcr2_MakeCall], [libmfcr2.h], [MFCR2], [MFCR2]) 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([ncurses], [initscr], [curses.h], [NCURSES], [ncurses], [])
AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt]) AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
AST_EXT_LIB([odbc], [SQLConnect], [sql.h], [UNIXODBC], [unixODBC]) 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_CHECK_HEADER([h323.h], [PBX_H323=1], [])
AC_SUBST(PBX_H323) AC_SUBST(PBX_H323)
HAVE_QUICKNET=0 AC_CHECK_HEADER([linux/ixjuser.h], [PBX_IXJUSER=1],[PBX_IXJUSER=0])
AC_CHECK_HEADER([ixjuser.h], [HAVE_QUICKNET=1],[]) AC_SUBST(PBX_IXJUSER)
AC_SUBST(HAVE_QUICKNET)
AC_ARG_WITH([vpb], AC_HELP_STRING([--with-vpb=PATH],[use vpb files in PATH]),[ AC_ARG_WITH([vpb], AC_HELP_STRING([--with-vpb=PATH],[use vpb files in PATH]),[
case ${withval} in case ${withval} in