[svn-commits] rmudgett: branch rmudgett/bkp_issue14068 r213780 - in /team/rmudgett/bkp_issu...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Aug 21 18:38:56 2009
New Revision: 213780

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213780
Log:
Merged revisions 213748 from
https://origsvn.digium.com/svn/asterisk/trunk

..........
r213748 | rmudgett | 2009-08-21 18:18:16 -0500 (Fri, 21 Aug 2009) | 2 lines

Update configure script for libpri COLP feature dependency requirements.

Modified:
    team/rmudgett/bkp_issue14068/channels/chan_dahdi.c
    team/rmudgett/bkp_issue14068/configure
    team/rmudgett/bkp_issue14068/configure.ac

Modified: team/rmudgett/bkp_issue14068/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/rmudgett/bkp_issue14068/channels/chan_dahdi.c?view=diff&rev=213780&r1=213779&r2=213780
==============================================================================
--- team/rmudgett/bkp_issue14068/channels/chan_dahdi.c (original)
+++ team/rmudgett/bkp_issue14068/channels/chan_dahdi.c Fri Aug 21 18:38:56 2009
@@ -66,6 +66,9 @@
 
 #ifdef HAVE_PRI
 #include <libpri.h>
+#ifndef PRI_EVENT_FACILITY
+#error please update libpri
+#endif
 #endif
 
 #ifdef HAVE_SS7
@@ -13835,9 +13838,6 @@
 #endif	/* defined(HAVE_PRI) */
 
 #if defined(HAVE_PRI)
-#ifndef PRI_RESTART
-#error "Upgrade your libpri"
-#endif
 static void dahdi_pri_message(struct pri *pri, char *s)
 {
 	int x, y;
@@ -15113,9 +15113,6 @@
 					ast_mutex_unlock(&pri->pvts[chanpos]->lock);
 				}
 				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) {
@@ -15281,9 +15278,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: team/rmudgett/bkp_issue14068/configure.ac
URL: http://svn.asterisk.org/svn-view/asterisk/team/rmudgett/bkp_issue14068/configure.ac?view=diff&rev=213780&r1=213779&r2=213780
==============================================================================
--- team/rmudgett/bkp_issue14068/configure.ac (original)
+++ team/rmudgett/bkp_issue14068/configure.ac Fri Aug 21 18:38:56 2009
@@ -1427,13 +1427,15 @@
 
 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([RESAMPLE], [resample], [resample_open], [libresample.h], [-lm])