From bf4ab5c91618ea185d4de8fe0d13e6c72ecc7490 Mon Sep 17 00:00:00 2001 From: tzafrir Date: Wed, 23 Apr 2008 19:20:53 +0000 Subject: 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 hopfully fix issue #12426 . git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4193 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- kernel/xpp/Kbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/xpp') diff --git a/kernel/xpp/Kbuild b/kernel/xpp/Kbuild index ca05049..f7f180b 100644 --- a/kernel/xpp/Kbuild +++ b/kernel/xpp/Kbuild @@ -20,7 +20,7 @@ endif 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))) -- cgit v1.2.3