X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=acinclude.m4;h=02dc9525e264fe6faf166e1c638534966688934c;hb=620606f63cc56c7541005dc6787106789e2c364e;hp=c332b41a8158e1cd8bd420d63020584bf8ef5ca9;hpb=b4e1bf8b7ef8704d857a9ee93d40719289b2139e;p=sliver-openvswitch.git

diff --git a/acinclude.m4 b/acinclude.m4
index c332b41a8..02dc9525e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -144,7 +144,8 @@ AC_DEFUN([OVS_CHECK_LINUX], [
          AC_ERROR([Linux kernel in build tree $KBUILD (source tree $KSRC) is version $kversion, but version 2.6 or later is required])
        fi
     fi
-    if test ! -e "$KBUILD"/include/linux/version.h || \
+    if (test ! -e "$KBUILD"/include/linux/version.h && \
+        test ! -e "$KBUILD"/include/generated/uapi/linux/version.h)|| \
        (test ! -e "$KBUILD"/include/linux/autoconf.h && \
         test ! -e "$KBUILD"/include/generated/autoconf.h); then
 	AC_MSG_ERROR([Linux kernel source in $KBUILD is not configured])
@@ -288,7 +289,7 @@ AC_DEFUN([OVS_CHECK_IF_PACKET],
                 [Define to 1 if net/if_packet.h is available.])
    fi])
 
-dnl Checks for net/if_dl.h
+dnl Checks for net/if_dl.h.
 AC_DEFUN([OVS_CHECK_IF_DL],
   [AC_CHECK_HEADER([net/if_dl.h],
                    [HAVE_IF_DL=yes],