Signed-off-by: Joe Stringer <joestrin...@nicira.com>
---
 acinclude.m4 |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index e9d0ed9..cd2301e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -133,18 +133,18 @@ AC_DEFUN([OVS_CHECK_LINUX], [
     fi
     AC_MSG_RESULT([$kversion])
 
-    if test "$version" -ge 3; then
-       if test "$version" = 3 && test "$patchlevel" -le 19; then
-          : # Linux 3.x
+    if test "$version" -ge 4; then
+       if test "$version" != 4 || test "$patchlevel" -ge 1; then
+          AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version 
newer than 4.0.x is not supported (please refer to the FAQ for advice)])
        else
-         AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version 
newer than 3.19.x is not supported (please refer to the FAQ for advice)])
+          : # Linux 4.x
        fi
+    elif test "$version" = 3; then
+       : # Linux 3.x
+    elif test "$version" = 2 && test "$patchlevel" -ge 6 && test "$sublevel" 
-ge 32; then
+       : # Linux 2.6.x
     else
-       if test "$version" -le 1 || test "$patchlevel" -le 5 || test 
"$sublevel" -le 31; then
-         AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version 
2.6.32 or later is required])
-       else
-         : # Linux 2.6.x
-       fi
+       AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version 
2.6.32 or later is required])
     fi
     if (test ! -e "$KBUILD"/include/linux/version.h && \
         test ! -e "$KBUILD"/include/generated/uapi/linux/version.h)|| \
-- 
1.7.10.4

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to