[asterisk-commits] mattf: trunk r154875 - in /trunk: ./ channels/ include/asterisk/

[SVN commits to the Asterisk project]

Author: mattf
Date: Wed Nov  5 14:45:03 2008
New Revision: 154875

URL: http://svn.digium.com/view/asterisk?view=rev&rev=154875
Log:
Make compilation of chan_dahdi so that it does not require the new pri_progress_with_cause function to have libpri support work.

Modified:
    trunk/channels/chan_dahdi.c
    trunk/configure
    trunk/configure.ac
    trunk/include/asterisk/autoconfig.h.in

Modified: trunk/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=154875&r1=154874&r2=154875
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Wed Nov  5 14:45:03 2008
@@ -5806,7 +5806,11 @@
 					&& p->pri && !p->outgoing) {
 				if (p->pri->pri) {		
 					if (!pri_grab(p, p->pri)) {
+#ifdef HAVE_PRI_PROG_W_CAUSE
 						pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, PRI_CAUSE_USER_BUSY); /* cause = 17 */
+#else
+						pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1);
+#endif
 						pri_rel(p->pri);
 					}
 					else
@@ -5903,7 +5907,11 @@
 					&& p->pri && !p->outgoing) {
 				if (p->pri->pri) {		
 					if (!pri_grab(p, p->pri)) {
+#ifdef HAVE_PRI_PROG_W_CAUSE
 						pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, -1);  /* no cause at all */
+#else
+						pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1);
+#endif
 						pri_rel(p->pri);
 					}
 					else
@@ -5939,7 +5947,11 @@
 					&& p->pri && !p->outgoing) {
 				if (p->pri) {		
 					if (!pri_grab(p, p->pri)) {
+#ifdef HAVE_PRI_PROG_W_CAUSE
 						pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, PRI_CAUSE_SWITCH_CONGESTION); /* cause = 42 */
+#else
+						pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1);
+#endif
 						pri_rel(p->pri);
 					} else
 						ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span);

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=154875&r1=154874&r2=154875
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Nov  5 14:45:03 2008
@@ -1365,7 +1365,9 @@
 
 AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h])
 
-AST_EXT_LIB_CHECK([PRI], [pri], [pri_progress_with_cause], [libpri.h])
+AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h])
+
+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])
 

Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=154875&r1=154874&r2=154875
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Wed Nov  5 14:45:03 2008
@@ -622,6 +622,12 @@
 
 /* Define to indicate the ${PRI_INBANDDISCONNECT_DESCRIP} library version */
 #undef HAVE_PRI_INBANDDISCONNECT_VERSION
+
+/* Define this to indicate the ${PRI_PROG_W_CAUSE_DESCRIP} library */
+#undef HAVE_PRI_PROG_W_CAUSE
+
+/* Define to indicate the ${PRI_PROG_W_CAUSE_DESCRIP} library version */
+#undef HAVE_PRI_PROG_W_CAUSE_VERSION
 
 /* Define to indicate the ${PRI_DESCRIP} library version */
 #undef HAVE_PRI_VERSION