diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-04 08:00:01 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-04 08:00:01 +0000 |
| commit | 52070b595a861d3d62d2cc1e60539d3e6cdd410f (patch) | |
| tree | 81d47ebc5e68f6b72ca57694d5f49693b7c33058 | |
| parent | 305623ae652ae8216ee32e6357aa82c8b79498d7 (diff) | |
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)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4233 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | xpp/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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))) |