--- chan_zap.c.old	2004-07-16 16:39:58.000000000 +0200
+++ chan_zap.c	2004-07-16 16:47:40.000000000 +0200
@@ -65,9 +65,11 @@
 
 #include "../asterisk.h"
 
+#ifdef ZAPATA_PRI
 #ifndef ZT_SIG_EM_E1
 #error "Your zaptel is too old.  please cvs update"
 #endif
+#endif
 
 /*
  * Define ZHONE_HACK to cause us to go off hook and then back on hook when
@@ -129,7 +131,9 @@
 #define SIG_SF_FEATD	(0x200000 | ZT_SIG_SF)
 #define	SIG_SF_FEATDMF	(0x400000 | ZT_SIG_SF)
 #define	SIG_SF_FEATB	(0x800000 | ZT_SIG_SF)
+#ifdef ZAPATA_PRI
 #define SIG_EM_E1	ZT_SIG_EM_E1
+#endif
 #define SIG_GR303FXOKS   (0x100000 | ZT_SIG_FXOKS)
 #define SIG_GR303FXSKS   (0x200000 | ZT_SIG_FXSKS)
 
@@ -593,8 +597,13 @@
 #define ISTRUNK(p) ((p->sig == SIG_FXSLS) || (p->sig == SIG_FXSKS) || \
 			(p->sig == SIG_FXSGS) || (p->sig == SIG_PRI))
 
+#ifdef ZAPATA_PRI
 #define CANBUSYDETECT(p) (ISTRUNK(p) || (p->sig & (SIG_EM | SIG_EM_E1 | SIG_SF)) /* || (p->sig & __ZT_SIG_FXO) */)
 #define CANPROGRESSDETECT(p) (ISTRUNK(p) || (p->sig & (SIG_EM | SIG_EM_E1 | SIG_SF)) /* || (p->sig & __ZT_SIG_FXO) */)
+#else
+#define CANBUSYDETECT(p) (ISTRUNK(p) || (p->sig & (SIG_EM | SIG_SF)) /* || (p->sig & __ZT_SIG_FXO) */)
+#define CANPROGRESSDETECT(p) (ISTRUNK(p) || (p->sig & (SIG_EM | SIG_SF)) /* || (p->sig & __ZT_SIG_FXO) */)
+#endif
 
 #ifdef ZAPATA_PRI
 /* translate between PRI causes and asterisk's */
@@ -957,8 +966,10 @@
 		return "E & M Immediate";
 	case SIG_EMWINK:
 		return "E & M Wink";
+#ifdef ZAPATA_PRI
 	case SIG_EM_E1:
 		return "E & M E1";
+#endif
 	case SIG_FEATD:
 		return "Feature Group D (DTMF)";
 	case SIG_FEATDMF:
@@ -1582,7 +1593,9 @@
 	case SIG_FXSKS:
 	case SIG_EMWINK:
 	case SIG_EM:
+#ifdef ZAPATA_PRI
 	case SIG_EM_E1:
+#endif
 	case SIG_FEATD:
 	case SIG_FEATDMF:
 	case SIG_E911:
@@ -2230,7 +2243,9 @@
 		p->ringt = 0;
 		/* Fall through */
 	case SIG_EM:
+#ifdef ZAPATA_PRI
 	case SIG_EM_E1:
+#endif
 	case SIG_EMWINK:
 	case SIG_FEATD:
 	case SIG_FEATDMF:
@@ -3070,7 +3085,11 @@
 					if (ast->_state == AST_STATE_DIALING) {
 						if ((p->callprogress & 1) && CANPROGRESSDETECT(p) && p->dsp && p->outgoing) {
 							ast_log(LOG_DEBUG, "Done dialing, but waiting for progress detection before doing more...\n");
-						} else if (p->confirmanswer || (!p->dialednone && ((p->sig == SIG_EM) || (p->sig == SIG_EM_E1) ||  (p->sig == SIG_EMWINK) || (p->sig == SIG_FEATD) || (p->sig == SIG_FEATDMF) || (p->sig == SIG_E911) || (p->sig == SIG_FEATB) || (p->sig == SIG_SF) || (p->sig == SIG_SFWINK) || (p->sig == SIG_SF_FEATD) || (p->sig == SIG_SF_FEATDMF) || (p->sig == SIG_SF_FEATB)))) {
+						} else if (p->confirmanswer || (!p->dialednone && ((p->sig == SIG_EM) || 
+#ifdef ZAPATA_PRI
+							(p->sig == SIG_EM_E1) ||  
+#endif
+							(p->sig == SIG_EMWINK) || (p->sig == SIG_FEATD) || (p->sig == SIG_FEATDMF) || (p->sig == SIG_E911) || (p->sig == SIG_FEATB) || (p->sig == SIG_SF) || (p->sig == SIG_SFWINK) || (p->sig == SIG_SF_FEATD) || (p->sig == SIG_SF_FEATDMF) || (p->sig == SIG_SF_FEATB)))) {
 							ast_setstate(ast, AST_STATE_RINGING);
 						} else {
 							ast_setstate(ast, AST_STATE_UP);
@@ -3296,7 +3315,9 @@
 				}
 				/* Fall through */
 			case SIG_EM:
+#ifdef ZAPATA_PRI
 			case SIG_EM_E1:
+#endif
 			case SIG_EMWINK:
 			case SIG_FEATD:
 			case SIG_FEATDMF:
@@ -3492,7 +3513,9 @@
 				update_conf(p);
 				break;
 			case SIG_EM:
+#ifdef ZAPATA_PRI
 			case SIG_EM_E1:
+#endif
 			case SIG_EMWINK:
 			case SIG_FEATD:
 			case SIG_SF:
@@ -3533,7 +3556,9 @@
 			case SIG_FXSGS:
 			case SIG_FXSKS:
 			case SIG_EM:
+#ifdef ZAPATA_PRI
 			case SIG_EM_E1:
+#endif
 			case SIG_EMWINK:
 			case SIG_FEATD:
 			case SIG_SF:
@@ -4540,7 +4565,9 @@
 			return NULL;
 		/* Fall through */
 	case SIG_EM:
+#ifdef ZAPATA_PRI
 	case SIG_EM_E1:
+#endif
 	case SIG_SF:
 		res = tone_zone_play_tone(p->subs[index].zfd, -1);
 		if (p->dsp)
@@ -5237,7 +5264,9 @@
 		case SIG_E911:
 		case SIG_FEATB:
 		case SIG_EM:
+#ifdef ZAPATA_PRI
 		case SIG_EM_E1:
+#endif
 		case SIG_SFWINK:
 		case SIG_SF_FEATD:
 		case SIG_SF_FEATDMF:
@@ -5285,7 +5314,9 @@
 		case SIG_E911:
 		case SIG_FEATB:
 		case SIG_EM:
+#ifdef ZAPATA_PRI
 		case SIG_EM_E1:
+#endif
 		case SIG_EMWINK:
 		case SIG_SF_FEATD:
 		case SIG_SF_FEATDMF:
@@ -5961,7 +5992,11 @@
 #endif
 		/* Adjust starttime on loopstart and kewlstart trunks to reasonable values */
 		if ((signalling == SIG_FXSKS) || (signalling == SIG_FXSLS) ||
-		    (signalling == SIG_EM) || (signalling == SIG_EM_E1) ||  (signalling == SIG_EMWINK) ||
+		    (signalling == SIG_EM) || 
+#ifdef ZAPATA_PRI
+			(signalling == SIG_EM_E1) ||  
+#endif
+			(signalling == SIG_EMWINK) ||
 			(signalling == SIG_FEATD) || (signalling == SIG_FEATDMF) ||
 			  (signalling == SIG_FEATB) || (signalling == SIG_E911) ||
 		    (signalling == SIG_SF) || (signalling == SIG_SFWINK) ||
@@ -8726,8 +8761,10 @@
 		} else if (!strcasecmp(v->name, "signalling")) {
 			if (!strcasecmp(v->value, "em")) {
 				cur_signalling = SIG_EM;
+#ifdef ZAPATA_PRI
 			} else if (!strcasecmp(v->value, "em_e1")) {
 				cur_signalling = SIG_EM_E1;
+#endif
 			} else if (!strcasecmp(v->value, "em_w")) {
 				cur_signalling = SIG_EMWINK;
 				cur_radio = 0;