---- xtables-addons-1.18/configure.ac~ 2009-09-09 17:37:07.000000000 +0200
-+++ xtables-addons-1.18/configure.ac 2009-11-02 11:19:36.000000000 +0100
-@@ -63,41 +63,6 @@
- kinclude_CFLAGS="$kinclude_CFLAGS -I $ksourcedir/include";
- fi;
+--- xtables-addons-1.31/configure.ac~ 2010-12-02 22:13:08.366366978 +0100
++++ xtables-addons-1.31/configure.ac 2010-12-02 22:14:14.780561896 +0100
+@@ -39,47 +39,6 @@
+ -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
+ -I\${XA_TOPSRCDIR}/include";
-#
-# check kernel version
- # Well, just a warning. Maybe the admin updated the kernel.
- echo "WARNING: This distribution's shipped kernel is not supported.";
-fi;
+-AC_MSG_CHECKING([kernel version that we will build against])
-krel="$(make -sC ${kbuilddir} kernelrelease)";
-krel="${krel%%-*}";
-kmajor="${krel%%.*}";
-kminor="${krel%%.*}";
-krel="${krel#*.}";
-kmicro="${krel%%.*}";
--krel2="${krel#*.}";
--if test "$krel" = "$krel2"; then
+-if test "$kmicro" = "$krel"; then
+- kmicro="$(($kmicro+0))"; # Get rid of non numbers ("2.6.36+" -> "2.6.36")
- kstable=0;
-else
-- kstable="${krel%%.*}";
-- if test -z "$kstable"; then
-- kstable=0;
-- fi;
+- kmicro="$(($kmicro+0))";
+- kstable="${krel#*.}";
+- kstable="$(($kstable+0))";
-fi;
--echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
--if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 31; then
-- echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
--elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$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.";
-- exit 1;
+-if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then
+- echo "WARNING: Version detection did not succeed. Continue at own luck.";
+-else
+- echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
+- if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then
+- echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
+- 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.";
+- exit 1;
+- fi;
-fi;
-
AC_SUBST([regular_CFLAGS])
- AC_SUBST([xtables_CFLAGS])
- AC_SUBST([kinclude_CFLAGS])
+ AC_SUBST([kbuilddir])
+ AC_SUBST([xtlibdir])