* Allow setting the echo canceller from the Makefile or the environment

  (needed for overriding the default EC in Debian m-a builds)
* Allow specifiying extra modules in the make command line:
  MODULES_EXTRA.


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2838 5390a7c7-147a-4af0-8ec9-7488f05a26cb

3 files changed, 17 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 4c3746b..fe818d3 100644
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,13 @@ MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm \
 ifeq ($(BUILDVER),linux26)
 MODULES+=ztdummy zttranscode
 endif
+
+# for building extra modules in this directory without editing the
+# Makefiles:
+# running:  make MODULES_EXTRA=mod1 mod2 subdir1/ subdir2/"
+# "subdir/" only works with kernel 2.6.
+MODULES+=$(MODULES_EXTRA)
+
 MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
 
 MODULESO:=$(MODULES:%=%.o)
diff --git a/Makefile.kernel26 b/Makefile.kernel26
index b42ed06..b019a48 100644
--- a/Makefile.kernel26
+++ b/Makefile.kernel26
@@ -13,7 +13,13 @@ obj-m+=xpp/
 endif
 endif
 
+ifndef ECHO_CAN_NAME
+  ECHO_CAN_NAME	:= MG2
+endif
+ECHO_CAN_CFLAGS	:= -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME)
+
 EXTRA_CFLAGS := -I$(src)
+EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS)
 
 # fix typo present in CentOS and RHEL 2.6.9 kernels
 BAD_KERNELS_VERS := 22 34 34.0.1 34.0.2
diff --git a/zconfig.h b/zconfig.h
index c5cf2c3..96c0e45 100644
--- a/zconfig.h
+++ b/zconfig.h
@@ -44,6 +44,9 @@
  */
 /* #define CONFIG_ZAPTEL_MMX */
 
+/** If defined: the user must define exactly one ECHO_CAN_ var: */
+#ifndef ECHO_CAN_FROMENV 
+
 /*
  * Pick your echo canceller.
  * 
@@ -71,7 +74,7 @@
  * MARK2 echo canceller
  */
 /* #define AGGRESSIVE_SUPPRESSOR */
-
+#endif /* ifndef ECHO_CAN_FROMENV */
 /*
  * Define to turn off the echo canceler disable tone detector,
  * which will cause zaptel to ignore the 2100 Hz echo cancel disable