From 41793158ea9f5815f6f9284e9408f7997cd23aff Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Wed, 3 Nov 2010 10:14:06 -0700 Subject: [PATCH] autoconf: Compat checks no longer support multiple files. We now test that a file exists before grepping but that doesn't work if there are multiple possible files. For the one case that needs this (kmemdup) break the test into two: check the first file and if the pattern isn't found check the second file. --- acinclude.m4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 2296dbd9..26081238 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -191,8 +191,10 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [ OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_warn_if_lro], [OVS_DEFINE([HAVE_SKB_WARN_LRO])]) - OVS_GREP_IFELSE([$KSRC26/include/linux/string.h $KSRC26/include/linux/slab.h], - [kmemdup], [OVS_DEFINE([HAVE_KMEMDUP])]) + OVS_GREP_IFELSE([$KSRC26/include/linux/string.h], [kmemdup], + [OVS_DEFINE([HAVE_KMEMDUP])], + [OVS_GREP_IFELSE([$KSRC26/include/linux/slab.h], [kmemdup], + [OVS_DEFINE([HAVE_KMEMDUP])])]) OVS_GREP_IFELSE([$KSRC26/include/linux/types.h], [bool], [OVS_DEFINE([HAVE_BOOL_TYPE])]) -- 2.30.2