[svn-commits] tzafrir: branch 1.2 r4233 - /branches/1.2/xpp/Kbuild

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sun May  4 03:00:01 2008
New Revision: 4233

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4233
Log:
A test for a specific #define in zconfig.h was done by invoking cpp .
Sadly the change of CFLAGS handling in kernel 2.6.24 meant that it is no
longer as easy to invoke cpp on our own. 

Impact: On kernel >= 2.6.24, xpd_bri never got built, even if the
bri_dchan patch was applied.

Fix: use a simpler grep instead. Hopefully noone passes it through other
means. This should fix issue #12426 .

(Backport of r4193 from branches/1.4)

Modified:
    branches/1.2/xpp/Kbuild

Modified: branches/1.2/xpp/Kbuild
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/Kbuild?view=diff&rev=4233&r1=4232&r2=4233
==============================================================================
--- branches/1.2/xpp/Kbuild (original)
+++ branches/1.2/xpp/Kbuild Sun May  4 03:00:01 2008
@@ -20,7 +20,7 @@
 
 obj-m		+= xpp.o xpd_fxs.o xpd_fxo.o xpd_pri.o
 
-HAS_BRISTUFF		:= $(shell cpp $(CPPFLAGS) -dM $(ZAP_KERNEL)/zconfig.h | sed -n 's/^.*CONFIG_ZAPATA_BRI_DCHANS/y/p')
+HAS_BRISTUFF	:= $(shell grep '^[[:space:]]*\#[[:space:]]*define[[:space:]]\+CONFIG_ZAPATA_BRI_DCHANS\>' $(ZAP_KERNEL)/zconfig.h)
 
 # Build only supported modules
 ifneq	(,$(filter y m,$(CONFIG_USB)))