sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update configure script for libpri COLP feature dependency requirements. 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@213748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett 2009-08-21 23:18:16 +00:00
parent c28fb2bf19
commit 4ae5535d8f
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
channels/sig_pri.c
View File

@ -47,6 +47,9 @@
#include "asterisk/features.h"
#include "sig_pri.h"
#ifndef PRI_EVENT_FACILITY
#error please update libpri
#endif
/* define this to send PRI user-user information elements */
#undef SUPPORT_USERUSER
@ -1981,9 +1984,6 @@ static void *pri_dchannel(void *vpri)
sig_pri_unlock_private(pri->pvts[chanpos]);
}
break;
#ifndef PRI_EVENT_FACILITY
#error please update libpri
#endif
case PRI_EVENT_FACILITY:
chanpos = pri_find_principle(pri, e->facility.channel);
if (chanpos < 0) {
@ -2115,9 +2115,6 @@ static void *pri_dchannel(void *vpri)
}
}
break;
#ifndef PRI_EVENT_HANGUP_REQ
#error please update libpri
#endif
case PRI_EVENT_HANGUP_REQ:
chanpos = pri_find_principle(pri, e->hangup.channel);
if (chanpos < 0) {

11
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 209623 .
# From configure.ac Revision: 210777 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for asterisk 1.6.
#
@ -43836,7 +43836,7 @@ if test "x${PBX_PRI}" != "x1" -a "${USE_PRI}" != "no"; then
pbxlibdir="-L${PRI_DIR}"
fi
fi
pbxfuncname="pri_new_bri"
pbxfuncname="pri_connected_line_update"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_PRI_FOUND=yes
else
@ -44096,6 +44096,9 @@ _ACEOF
fi
# ------------------------------------v
# TODO: The code can be changed to always include these features now.
# These features will always be present if pri_connected_line_update is available.
if test "x${PBX_PRI_PROG_W_CAUSE}" != "x1" -a "${USE_PRI_PROG_W_CAUSE}" != "no"; then
pbxlibdir=""
@ -44367,7 +44370,6 @@ _ACEOF
fi
if test "x${PBX_PRI_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}" != "no"; then
pbxlibdir=""
# if --with-PRI_INBANDDISCONNECT=DIR has been specified, use it.
@ -44638,7 +44640,6 @@ _ACEOF
fi
if test "x${PBX_PRI_SERVICE_MESSAGES}" != "x1" -a "${USE_PRI_SERVICE_MESSAGES}" != "no"; then
pbxlibdir=""
# if --with-PRI_SERVICE_MESSAGES=DIR has been specified, use it.
@ -44909,7 +44910,6 @@ _ACEOF
fi
if test "x${PBX_PRI_REVERSE_CHARGE}" != "x1" -a "${USE_PRI_REVERSE_CHARGE}" != "no"; then
pbxlibdir=""
# if --with-PRI_REVERSE_CHARGE=DIR has been specified, use it.
@ -45179,6 +45179,7 @@ _ACEOF
fi
fi
# ------------------------------------^
if test "x${PBX_RESAMPLE}" != "x1" -a "${USE_RESAMPLE}" != "no"; then

9
configure.ac
View File

@ -1457,15 +1457,16 @@ AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h])
AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h])
AST_EXT_LIB_CHECK([PRI], [pri], [pri_connected_line_update], [libpri.h])
# ------------------------------------v
# TODO: The code can be changed to always include these features now.
# These features will always be present if pri_connected_line_update is available.
AST_EXT_LIB_CHECK([PRI_PROG_W_CAUSE], [pri], [pri_progress_with_cause], [libpri.h])
AST_EXT_LIB_CHECK([PRI_INBANDDISCONNECT], [pri], [pri_set_inbanddisconnect], [libpri.h])
AST_EXT_LIB_CHECK([PRI_SERVICE_MESSAGES], [pri], [pri_maintenance_service], [libpri.h])
AST_EXT_LIB_CHECK([PRI_REVERSE_CHARGE], [pri], [pri_sr_set_reversecharge], [libpri.h])
# ------------------------------------^
AST_EXT_LIB_CHECK([RESAMPLE], [resample], [resample_open], [libresample.h], [-lm])