Eliminate unused second argument to OFP_CHECK_LINUX in configure scripts.

diff --git a/acinclude.m4 b/acinclude.m4
index fc856c5c51977ea8e10d2c16b52c67138e063682..0a74510891491be4d09255f58575c1b2aaedebfc 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -37,8 +37,8 @@ dnl
 dnl Configure linux kernel source tree 
 AC_DEFUN([OFP_CHECK_LINUX], [
   AC_ARG_WITH([$1],
-              [AC_HELP_STRING([--with-$1=/path/to/linux-$3],
-                              [Specify the linux $3 kernel sources])],
+              [AC_HELP_STRING([--with-$1=/path/to/linux-$2],
+                              [Specify the linux $2 kernel sources])],
               [path="$withval"], [path=])dnl
   if test -n "$path"; then
     path=`eval echo "$path"`
@@ -46,8 +46,8 @@ AC_DEFUN([OFP_CHECK_LINUX], [
     AC_MSG_CHECKING([for $path directory])
     if test -d "$path"; then
        AC_MSG_RESULT([yes])
-       $4=$path
-       AC_SUBST($4)
+       $3=$path
+       AC_SUBST($3)
     else
        AC_MSG_RESULT([no])
        AC_ERROR([source dir $path doesn't exist])
@@ -56,16 +56,16 @@ AC_DEFUN([OFP_CHECK_LINUX], [
     AC_MSG_CHECKING([for $path kernel version])
     version=`grep '^PATCHLEVEL = ' "$path/Makefile" | sed 's/PATCHLEVEL = '//`
     AC_MSG_RESULT([2.$version])
-    if test "2.$version" != '$3'; then
-       AC_ERROR([Linux kernel source in $path is not version $3])
+    if test "2.$version" != '$2'; then
+       AC_ERROR([Linux kernel source in $path is not version $2])
     fi
     if ! test -e "$path"/include/linux/version.h || \
        ! test -e "$path"/include/linux/autoconf.h; then
        AC_MSG_ERROR([Linux kernel source in $path is not configured])
     fi
-    m4_if($3, [2.6], [OFP_CHECK_LINUX26_COMPAT])
+    m4_if($2, [2.6], [OFP_CHECK_LINUX26_COMPAT])
   fi
-  AM_CONDITIONAL($5, test -n "$path")
+  AM_CONDITIONAL($4, test -n "$path")
 ])
 
 dnl OFP_GREP_IFELSE(FILE, REGEX, IF-MATCH, IF-NO-MATCH)

diff --git a/configure.ac b/configure.ac
index f2d81633568040b8cde1ac24584fac8ccde503ef..c69633822f74fc13f4fcab9494b89203e319101c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,8 +59,8 @@ AC_CHECK_FUNCS([strsignal])
 
 AC_ARG_VAR(KARCH, [Kernel Architecture String])
 AC_SUBST(KARCH)
-OFP_CHECK_LINUX(l26, 2.6, 2.6, KSRC26, L26_ENABLED)
-OFP_CHECK_LINUX(l24, 2.4, 2.4, KSRC24, L24_ENABLED)
+OFP_CHECK_LINUX(l26, 2.6, KSRC26, L26_ENABLED)
+OFP_CHECK_LINUX(l24, 2.4, KSRC24, L24_ENABLED)
 
 OFP_CHECK_DPKG_BUILDPACKAGE