[svn-commits] dbailey: trunk r104045 - in /trunk: channels/chan_zap.c configure configure.ac

[SVN commits to the Digium repositories]

Author: dbailey
Date: Fri Feb 22 17:56:55 2008
New Revision: 104045

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104045
Log:
Add protection to chan_zap build when NEONMWI events are not defined

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

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=104045&r1=104044&r2=104045
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Fri Feb 22 17:56:55 2008
@@ -7313,8 +7313,10 @@
 			res = zt_get_event(mtd->pvt->subs[SUB_REAL].zfd);
 
 			switch (res) {
+#ifdef HAVE_ZAPTEL_NEONMWI
 			case ZT_EVENT_NEONMWI_ACTIVE:
 			case ZT_EVENT_NEONMWI_INACTIVE:
+#endif
 			case ZT_EVENT_NONE:
 			case ZT_EVENT_BITSCHANGED:
 				break;
@@ -7639,6 +7641,7 @@
 				i->channel);
 		zap_destroy_channel_bynum(i->channel);
 		break;
+#ifdef HAVE_ZAPTEL_NEONMWI
 	case ZT_EVENT_NEONMWI_ACTIVE:
 		if (i->mwimonitor_neon) {
 			notify_message(i->mailbox, 1);
@@ -7651,6 +7654,7 @@
 			ast_log(LOG_NOTICE, "NEON MWI cleared for channel %d, mailbox %s\n", i->channel, i->mailbox);
 		}
 		break;
+#endif
 	}
 	return 0;
 }

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=104045&r1=104044&r2=104045
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Feb 22 17:56:55 2008
@@ -254,6 +254,7 @@
 AST_EXT_LIB_SETUP([ZAPTEL_TRANSCODE], [Zaptel Transcoder Support], [zaptel_transcode])
 AST_EXT_LIB_SETUP([ZAPTEL_VLDTMF], [Zaptel VLDTMF Support], [zaptel_vldtmf])
 AST_EXT_LIB_SETUP([ZAPTEL_HWGAIN], [Zaptel Hardware Gain Support], [zaptel_hwgain])
+AST_EXT_LIB_SETUP([ZAPTEL_NEONMWI], [Zaptel Neon MWI Support], [zaptel_neonmwi])
 AST_EXT_LIB_SETUP([ZAPTEL_ECHOCANPARAMS], [Zaptel Echo Canceler Parameter Support], [zaptel_echocanparams])
 AST_EXT_LIB_SETUP([ZAPTEL_CHANALARMS], [Zaptel Channel Alarm Support], [zaptel_chanalarms])
 
@@ -1430,6 +1431,9 @@
 # Check for hwgain support
 AST_C_DEFINE_CHECK([ZAPTEL_HWGAIN], [ZT_SET_HWGAIN], [zaptel/zaptel.h])
 
+# Check for neon mwi support
+AST_C_DEFINE_CHECK([ZAPTEL_NEONMWI], [ZT_EVENT_NEONMWI_ACTIVE], [zaptel/zaptel.h])
+
 # Check for channel alarm support
 AST_C_COMPILE_CHECK([ZAPTEL_CHANALARMS], [size_t foo = sizeof(struct zt_params_v1)], [zaptel/zaptel.h])