[svn-commits] rmudgett: trunk r213748 - in /trunk: channels/sig_pri.c configure configure.ac

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Aug 21 18:18:16 2009
New Revision: 213748

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213748
Log:
Update configure script for libpri COLP feature dependency requirements.

Modified:
    trunk/channels/sig_pri.c
    trunk/configure
    trunk/configure.ac

Modified: trunk/channels/sig_pri.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/sig_pri.c?view=diff&rev=213748&r1=213747&r2=213748
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Fri Aug 21 18:18:16 2009
@@ -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 @@
 					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 @@
 					}
 				}
 				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) {

Modified: trunk/configure.ac
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/configure.ac?view=diff&rev=213748&r1=213747&r2=213748
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Aug 21 18:18:16 2009
@@ -1457,15 +1457,16 @@
 
 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])