anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-06 20:55:13 +02:00
Code Issues Releases Wiki Activity

build: restore functionality of configure's --without-kbuild option

Browse Source
This commit is contained in:
Jan Engelhardt
2011-01-13 20:23:15 +01:00
parent d82b20ead7
commit 65e97a66e6
2 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
configure.ac
View File

@@ -49,35 +49,37 @@ if grep -q "CentOS release 5\." /etc/redhat-release 2>/dev/null ||
# Well, just a warning. Maybe the admin updated the kernel. # Well, just a warning. Maybe the admin updated the kernel.
echo "WARNING: This distribution's shipped kernel is not supported."; echo "WARNING: This distribution's shipped kernel is not supported.";
fi; fi;
AC_MSG_CHECKING([kernel version that we will build against]) if test -n "$kbuilddir"; then
krel="$(make -sC "$kbuilddir" M=. kernelrelease)"; AC_MSG_CHECKING([kernel version that we will build against])
kmajor="${krel%%[[^0-9]]*}"; krel="$(make -sC "$kbuilddir" M=. kernelrelease)";
kmajor="$(($kmajor+0))"; kmajor="${krel%%[[^0-9]]*}";
krel="${krel:${#kmajor}}"; kmajor="$(($kmajor+0))";
krel="${krel#.}"; krel="${krel:${#kmajor}}";
kminor="${krel%%[[^0-9]]*}"; krel="${krel#.}";
kminor="$(($kminor+0))"; kminor="${krel%%[[^0-9]]*}";
krel="${krel:${#kminor}}"; kminor="$(($kminor+0))";
krel="${krel#.}"; krel="${krel:${#kminor}}";
kmicro="${krel%%[[^0-9]]*}"; krel="${krel#.}";
kmicro="$(($kmicro+0))"; kmicro="${krel%%[[^0-9]]*}";
krel="${krel:${#kmicro}}"; kmicro="$(($kmicro+0))";
krel="${krel#.}"; krel="${krel:${#kmicro}}";
kstable="${krel%%[[^0-9]]*}"; krel="${krel#.}";
kstable="$(($kstable+0))"; kstable="${krel%%[[^0-9]]*}";
if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then kstable="$(($kstable+0))";
echo "WARNING: Version detection did not succeed. Continue at own luck."; if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then
else echo "WARNING: Version detection did not succeed. Continue at own luck.";
echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; else
if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 37; then echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
echo "WARNING: You are trying a newer kernel. Results may vary. :-)"; if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 37; then
elif test \( "$kmajor" -lt 2 -o \ echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
\( "$kmajor" -eq 2 -a "$kminor" -lt 6 \) -o \ elif test \( "$kmajor" -lt 2 -o \
\( "$kmajor" -eq 2 -a "$kminor" -eq 0 -a "$kmicro" -lt 17 \) -o \ \( "$kmajor" -eq 2 -a "$kminor" -lt 6 \) -o \
\( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \ \( "$kmajor" -eq 2 -a "$kminor" -eq 0 -a "$kmicro" -lt 17 \) -o \
"$kstable" -lt 5 \) \); then \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \
echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration."; "$kstable" -lt 5 \) \); then
exit 1; echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration.";
exit 1;
fi;
fi; fi;
fi; fi;

1
doc/changelog.txt
View File

@@ -2,6 +2,7 @@
HEAD HEAD
==== ====
Fixes: Fixes:
- build: restore functionality of `configure --without-kbuild`
- xt_LOGMARK: fix detection of untracked connection for Linux >= 2.6.36 - xt_LOGMARK: fix detection of untracked connection for Linux >= 2.6.36