From: Michael Meffie Date: Mon, 9 Apr 2018 20:42:41 +0000 (-0400) Subject: autoconf: remove more linux 2.4 references X-Git-Tag: upstream/1.8.1_pre2^2~48 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=489dce6049a90cbef596b29ccff8d15b3bee6fdb;p=packages%2Fo%2Fopenafs.git autoconf: remove more linux 2.4 references Remove old linux 2.2 and 2.4 references in the autoconf macros left over from the linux 2.2 and 2.4 days. Reviewed-on: https://gerrit.openafs.org/13003 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk (cherry picked from commit 833a81eeda6e48ea1ced92169434e843d054c44d) Change-Id: I3bf407ec084d911cc826b50fc39f48a20eb0fd77 Reviewed-on: https://gerrit.openafs.org/13110 Tested-by: BuildBot Reviewed-by: Michael Meffie Reviewed-by: Benjamin Kaduk --- diff --git a/src/cf/linux-guess-version.m4 b/src/cf/linux-guess-version.m4 index 365051ad9..c0f9af0d3 100644 --- a/src/cf/linux-guess-version.m4 +++ b/src/cf/linux-guess-version.m4 @@ -6,8 +6,6 @@ else GUESS_LINUX_VERSION=`uname -r` fi case "$GUESS_LINUX_VERSION" in - 2.2.*) AFS_SYSKVERS=22 ;; - 2.4.*) AFS_SYSKVERS=24 ;; [2.6.* | [3-9]* | [1-2][0-9]*]) AFS_SYSKVERS=26 ;; *) AC_MSG_ERROR(Couldn't guess your Linux version [2]) ;; esac diff --git a/src/cf/linux-kernel-path.m4 b/src/cf/linux-kernel-path.m4 index ac43a859d..2c6212ad8 100644 --- a/src/cf/linux-kernel-path.m4 +++ b/src/cf/linux-kernel-path.m4 @@ -4,7 +4,6 @@ if test "x$with_linux_kernel_headers" != "x"; then else for utsdir in "/lib/modules/`uname -r`/build" \ "/lib/modules/`uname -r`/source" \ - "/usr/src/linux-2.4" \ "/usr/src/linux"; do LINUX_KERNEL_PATH="$utsdir" for utsfile in "include/generated/utsrelease.h" \ diff --git a/src/cf/options.m4 b/src/cf/options.m4 index a92b7c04a..0e1c9dfb2 100644 --- a/src/cf/options.m4 +++ b/src/cf/options.m4 @@ -53,7 +53,7 @@ AC_ARG_WITH([linux-kernel-headers], [AS_HELP_STRING([--with-linux-kernel-headers=path], [use the kernel headers found at path (optional, defaults to /lib/modules/`uname -r`/build, then /lib/modules/`uname -r`/source, - then /usr/src/linux-2.4, and lastly /usr/src/linux)]) + and lastly /usr/src/linux)]) ]) AC_ARG_WITH([linux-kernel-build], [AS_HELP_STRING([--with-linux-kernel-build=path],