From e0510a6c9b4b82b90ccf564368c1bbdcfdeb7410 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 23 Mar 2010 09:27:08 -0700 Subject: datapath: Support 2.6.33 kernel layout in build system. The 2.6.33 kernel moves generated header files to include/generated, so we need to look for autoconf.h there. Reported-by: Brandon Heller --- acinclude.m4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'acinclude.m4') diff --git a/acinclude.m4 b/acinclude.m4 index e38676fdc..abbc57e61 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -70,8 +70,9 @@ AC_DEFUN([OVS_CHECK_LINUX26], [ AC_ERROR([Linux kernel in build tree $KBUILD26 (source tree $KSRC26) is not version 2.6]) fi fi - if ! test -e "$KBUILD26"/include/linux/version.h || \ - ! test -e "$KBUILD26"/include/linux/autoconf.h; then + if test ! -e "$KBUILD26"/include/linux/version.h || \ + (test ! -e "$KBUILD26"/include/linux/autoconf.h && \ + test ! -e "$KBUILD26"/include/generated/autoconf.h); then AC_MSG_ERROR([Linux kernel source in $KBUILD26 is not configured]) fi OVS_CHECK_LINUX26_COMPAT -- cgit v1.2.1