[svn-commits] tzafrir: branch linux/2.6 r10442 - in /linux/branches/2.6: ./ drivers/dahdi/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue Jan 17 08:50:01 2012
New Revision: 10442

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10442
Log:
Build OSLEC EC if in the tree

Build the OSLEC echo canceller (drivers/staging/echo and
dahdi_echocan_oslec) if the code of oslec is present in the tree.

Also closing another issue regarding documentation of building OSLEC,
as it is now even clearer than before.

Patch has been used in the Debian package for quite some time.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

(closes issue DAHLIN-110)
Reported by: biohumanoid (Pavel Selivanov)
Patches:
     oslec_auto.diff uploaded by tzafrir (license 5035)

(closes issue DAHLIN-261)

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10440

Modified:
    linux/branches/2.6/README
    linux/branches/2.6/drivers/dahdi/Kbuild

Modified: linux/branches/2.6/README
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.6/README?view=diff&rev=10442&r1=10441&r2=10442
==============================================================================
--- linux/branches/2.6/README (original)
+++ linux/branches/2.6/README Tue Jan 17 08:50:01 2012
@@ -212,13 +212,10 @@
 this is where the oslec code lies. If it is elsewhere you'll need to fix
 the #include line.
 
-Thus for the moment, the simplest way to build OSLEC with dahdi is:
-
-1. Copy the directory `drivers/staging/echo` from a recent kernel tree 
-   (at least 2.6.28-rc1) to the a subdirectory with the same name in the
-   dahdi-linux tree.
-
-2. Edit drivers/dahdi/Kbuild and uncomment the two lines related to OSLEC.
+Thus for the moment, the simplest way to build OSLEC with dahdi is to
+copy the directory `drivers/staging/echo` from a recent kernel tree (at
+least 2.6.28-rc1) to the a subdirectory with the same name in the
+dahdi-linux tree.
 
 After doing that, you'll see the following when building (running
 'make')

Modified: linux/branches/2.6/drivers/dahdi/Kbuild
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.6/drivers/dahdi/Kbuild?view=diff&rev=10442&r1=10441&r2=10442
==============================================================================
--- linux/branches/2.6/drivers/dahdi/Kbuild (original)
+++ linux/branches/2.6/drivers/dahdi/Kbuild Tue Jan 17 08:50:01 2012
@@ -33,14 +33,13 @@
 
 obj-m += $(DAHDI_MODULES_EXTRA)
 
-# Only enable this if you think you know what you're doing. This is not
-# supported yet:
-#obj-m += dahdi_echocan_oslec.o
-#
-# A quick and dirty way to build OSLEC, if you happened to place it
-# yourself in the dahdi source tree. This is experimental. See README
-# regarding OSLEC.
-#obj-m += ../staging/echo/
+# If you want to build OSLEC, include the code in the standard location:
+# drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as
+# well:
+ifneq (,$(wildcard $(src)/../staging/echo/echo.c))
+obj-m += dahdi_echocan_oslec.o
+obj-m += ../staging/echo/
+endif
 
 CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)