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

diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 98a6d019819341afce658b7221f3820fc2f2fdb8..2184b841bf83aaa234dbdb1b2552f1614a904294 100644 (file)
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -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) {

diff --git a/configure b/configure
index df9d201ae4fbc3948f671bc1848b90300afc3a14..59e698fdff6a3eee8c32a4faaa5ae9373131387e 100755 (executable)
--- a/configure
+++ b/configure
@@ -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

diff --git a/configure.ac b/configure.ac
index 224f5f093ac7184a2cbeeaa4de6a94752a8aa141..4c8a314ff8423d8db0b9b31696dcfc99ad44509c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])