Index: channels/Makefile.am
===================================================================
--- channels/Makefile.am	(revision 859)
+++ channels/Makefile.am	(working copy)
@@ -43,4 +43,11 @@
 chan_capi_la_LDFLAGS = -module -avoid-version -no-undefined
 endif HAVE_CAPI
 
-INCLUDES = -I${top_srcdir}/corelib
+if WANT_CHAN_ZAP
+opbxmod_LTLIBRARIES	+= chan_zap.la
+chan_zap_la_SOURCES	= chan_zap.c
+chan_zap_la_LIBADD 	= -ltonezone -lpri ${top_srcdir}/corelib/libopenpbx.la
+chan_zap_la_LDFLAGS	= -module -avoid-version -no-undefined
+endif WANT_CHAN_ZAP
+
+#INCLUDES = -I${top_srcdir}/corelib
Index: configure.ac
===================================================================
--- configure.ac	(revision 859)
+++ configure.ac	(working copy)
@@ -358,7 +358,6 @@
 AM_CONDITIONAL([USE_NEWT],[test -n "${HAVE_LIBNEWT}"])
 AC_CHECK_LIB([nsl], [main])
 AC_CHECK_LIB([ossaudio], [main])
-AC_CHECK_LIB([pri], [main],[AC_DEFINE([HAVE_LIBPRI],["yes"],[say hi to libpri])])
 AC_CHECK_LIB([pthread], [main])
 AC_CHECK_LIB([resolv], [main])
 AC_CHECK_LIB([rt], [main])
@@ -367,8 +366,6 @@
 AM_CONDITIONAL([HAS_SPEEX],[test -n "${HAVE_LIBSPEEX}"])
 AC_CHECK_LIB([t], [main])
 # AC_CHECK_LIB([termcap], [main])
-AC_CHECK_LIB([tonezone], [main],[AC_DEFINE([HAVE_LIBTONEZONE],["yes"],[OK, zaptel is there])])
-AM_CONDITIONAL([HAVE_ZAPTEL],[test -n "${HAVE_LIBTONEZONE}"])
 
 AC_CHECK_LIB([z], [main], [HAVE_LIBZ=1])
 
@@ -639,6 +636,18 @@
 AC_SUBST([CHAN_EXOSIP2_CFLAGS])
 AC_SUBST([CHAN_EXOSIP2_LIBS])
 
+dnl ########## chan_zap ##########
+
+AC_CHECK_LIB([pri], [main], [HAVE_LIBPRI=1])
+
+AC_CHECK_LIB([tonezone], [main], [HAVE_LIBTONEZONE=1])
+
+AC_ARG_WITH([chan_zap],
+	[AC_HELP_STRING([--with-chan_zap],[Build and install chan_zap (default=yes)])],,
+	[with_chan_zap="yes"])
+
+AM_CONDITIONAL([WANT_CHAN_ZAP], [test "${with_chan_zap}" = "yes" -a -n "${HAVE_LIBTONEZONE}" -a -n "${HAVE_LIBPRI}"])
+
 ####### apps
 
 dnl app_icd