datapath: Support 2.6.33 kernel layout in build system.

[openvswitch] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index e38676fdc013d35f2c3ae91aa6e00e847acb9b95..abbc57e61c83e0bce84b77a7fcd3345edd30d7df 100644 (file)
--- 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