build: notify of unsupported Linux kernel versions

diff --git a/INSTALL b/INSTALL
index a1e3a775f43cb92d96725e49847a6b3e9a95f839..924889c09ebc7f7b807115a760652dbbc7c94a86 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ Supported configurations for this release
 
        * iptables >= 1.4.3
 
-       * kernel-source >= 2.6.17, no upper bound known
+       * kernel-source >= 2.6.29
          with prepared build/output directory
          - CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK
          - CONFIG_NF_CONNTRACK_MARK or CONFIG_IP_NF_CONNTRACK_MARK
@@ -22,12 +22,6 @@ Supported configurations for this release
          - CONFIG_CONNECTOR y/m if you wish to receive userspace
            notifications from pknock through netlink/connector
 
-Extra notes:
-
-       * in the kernel 2.6.18.x series, >= 2.6.18.5 is required
-
-       * requires that no vendor backports interfere
-
 For ipset-5 you need:
 
        * libmnl

diff --git a/configure.ac b/configure.ac
index 80006a6f72089d758385279ff7a3073788c2ecd4..0565050082a89848a7e2c7a26ff72c500574badf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,15 +40,6 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
        -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
        -Winline -pipe";
 
-#
-# check kernel version
-#
-if grep -q "CentOS release 5\." /etc/redhat-release 2>/dev/null ||
-    grep -q "Red Hat Enterprise Linux Server release 5" /etc/redhat-release 2>/dev/null; then
-       # しまった!
-       # Well, just a warning. Maybe the admin updated the kernel.
-       echo "WARNING: This distribution's shipped kernel is not supported.";
-fi;
 if test -n "$kbuilddir"; then
        AC_MSG_CHECKING([kernel version that we will build against])
        krel="$(make -sC "$kbuilddir" M=. kernelrelease)";
@@ -72,13 +63,17 @@ if test -n "$kbuilddir"; then
                echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
                if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 38; then
                        echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
+               elif test "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -ge 29; then
+                       :; # everything ok
                elif test \( "$kmajor" -lt 2 -o \
                    \( "$kmajor" -eq 2 -a "$kminor" -lt 6 \) -o \
                    \( "$kmajor" -eq 2 -a "$kminor" -eq 0 -a "$kmicro" -lt 17 \) -o \
                    \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \
                    "$kstable" -lt 5 \) \); then
-                       echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration.";
+                       echo "ERROR: That kernel version is not supported at all. Please see INSTALL for minimum configuration.";
                        exit 1;
+               else
+                       echo "WARNING: That kernel version has been recently deprecated for use with Xtables-addons). Compilation may fail.";
                fi;
        fi;
 fi;