diff -urP xtables-addons-1.30.org/configure.ac xtables-addons-1.30/configure.ac --- xtables-addons-1.30.org/configure.ac 2010-05-31 09:47:58.385362271 +0800 +++ xtables-addons-1.30/configure.ac 2010-05-31 10:01:32.727112933 +0800 @@ -9,18 +9,6 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL -AC_ARG_WITH([kbuild], - AS_HELP_STRING([--with-kbuild=PATH], - [Path to kernel build directory [[/lib/modules/CURRENT/build]]]), - [kbuilddir="$withval"], - [kbuilddir="/lib/modules/$(uname -r)/build"]) -# -# check for --without-kbuild -# -if [[ "$kbuilddir" == no ]]; then - kbuilddir=""; -fi - AC_ARG_WITH([xtlibdir], AS_HELP_STRING([--with-xtlibdir=PATH], [Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]), @@ -37,42 +25,7 @@ -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \ -I\${XA_TOPSRCDIR}/include"; -# -# 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; -krel="$(make -sC ${kbuilddir} kernelrelease)"; -krel="${krel%%-*}"; -kmajor="${krel%%.*}"; -krel="${krel#*.}"; -kminor="${krel%%.*}"; -krel="${krel#*.}"; -kmicro="${krel%%.*}"; -if test "$kmicro" = "$krel"; then - kstable=0; -else - kstable="${krel#*.}"; - if test -z "$kstable"; then - kstable=0; - fi; -fi; -echo "Found kernel version $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 "$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; -fi; - AC_SUBST([regular_CFLAGS]) -AC_SUBST([kbuilddir]) AC_SUBST([xtlibdir]) AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans geoip/Makefile extensions/Makefile extensions/ACCOUNT/Makefile extensions/ipset/Makefile extensions/pknock/Makefile]) diff -urP xtables-addons-1.30.org/extensions/Makefile.am xtables-addons-1.30/extensions/Makefile.am --- xtables-addons-1.30.org/extensions/Makefile.am 2010-05-31 09:47:58.363361712 +0800 +++ xtables-addons-1.30/extensions/Makefile.am 2010-05-31 10:02:08.845363738 +0800 @@ -1,26 +1,4 @@ # -*- Makefile -*- # AUTOMAKE -# Not having Kbuild in Makefile.extra because it will already recurse -.PHONY: modules modules_install clean_modules - -_kcall = -C ${kbuilddir} M=${abs_srcdir} - -modules: - @echo -n "Xtables-addons ${PACKAGE_VERSION} - Linux " - @if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} --no-print-directory -s kernelrelease; fi; - ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi; - -modules_install: - ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} INSTALL_MOD_PATH=${DESTDIR} ext-mod-dir='$${INSTALL_MOD_DIR}' modules_install; fi; - -clean_modules: - ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} clean; fi; - -all-local: modules - -install-exec-local: modules_install - -clean-local: clean_modules - include ../Makefile.extra diff -urP xtables-addons-1.30.org/Makefile.am xtables-addons-1.30/Makefile.am --- xtables-addons-1.30.org/Makefile.am 2010-05-31 09:47:58.385362271 +0800 +++ xtables-addons-1.30/Makefile.am 2010-05-31 09:52:19.632360246 +0800 @@ -12,7 +12,6 @@ ${MAKE} -f Makefile.mans all; install-exec-hook: - depmod -a || :; config.status: Makefile.iptrules.in