aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-13 06:22:36 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-13 06:22:36 +0000
commit48d0c5d847adbb0c300c0b61ba1a3098d3c64bb6 (patch)
tree6606e8239a34a7a87a8278eb82935127e2aa5ae9
parent003a02c6aed89bad440a0c4ec5acef26965b0d23 (diff)
downloadglibc-48d0c5d847adbb0c300c0b61ba1a3098d3c64bb6.tar
glibc-48d0c5d847adbb0c300c0b61ba1a3098d3c64bb6.tar.gz
glibc-48d0c5d847adbb0c300c0b61ba1a3098d3c64bb6.tar.bz2
glibc-48d0c5d847adbb0c300c0b61ba1a3098d3c64bb6.zip
Update.
* sysdeps/unix/sysv/linux/configure.in: Improve handling of minimal kernel versions. Add information about IA-64 kernel.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/configure43
-rw-r--r--sysdeps/unix/sysv/linux/configure.in37
3 files changed, 44 insertions, 39 deletions
diff --git a/ChangeLog b/ChangeLog
index 9158fde02f..568b900fe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-06-12 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/configure.in: Improve handling of
+ minimal kernel versions. Add information about IA-64 kernel.
+
* sysdeps/unix/sysv/linux/configure.in: Allow architecture
specific minimal supported kernel versions to be specified.
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index e8d884df82..acc47c5b3b 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -51,37 +51,38 @@ fi
# If the user gave a minimal version number test whether the available
# kernel headers are young enough. Additionally we have minimal
# kernel versions for some architectures.
+case "$machine" in
+ sh*)
+ arch_minimum_kernel=2.3.99
+ ;;
+ ia64*)
+ arch_minimum_kernel=2.4.0
+ ;;
+ *)
+ arch_minimum_kernel=2.0.10
+ ;;
+esac
if test -n "$minimum_kernel"; then
- case "$machine" in
- sh*)
- arch_minimum_kernel=2.3.99
- ;;
- *)
- ;;
- esac
-
- user_version=$((`echo $minimum_kernel.0.0.0 | sed 's/\(0-9*\)\.\(0-9*\)\.\(0-9*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
- arch_version=$((`echo $arch_minimum_kernel.0.0.0 | sed 's/\(0-9*\)\.\(0-9*\)\.\(0-9*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
- if test $user_version -lt $arch_minimum_kernel; then
+
+ user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
+ arch_version=$((`echo "$arch_minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
+
+ if test $user_version -lt $arch_version; then
echo "configure: warning: minimum kernel version reset to $arch_minimum_kernel" 1>&2
minimum_kernel=$arch_minimum_kernel
fi
else
- case "$machine" in
- sh*)
- minimum_kernel = 2.3.99
- ;;
- *)
- ;;
- esac
+ if test $arch_minimum_kernel != '2.0.10'; then
+ minimum_kernel=$arch_minimum_kernel
+ fi
fi
if test -n "$minimum_kernel"; then
echo $ac_n "checking for kernel header at least $minimum_kernel""... $ac_c" 1>&6
-echo "configure:82: checking for kernel header at least $minimum_kernel" >&5
+echo "configure:83: checking for kernel header at least $minimum_kernel" >&5
decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
cat > conftest.$ac_ext <<EOF
-#line 85 "configure"
+#line 86 "configure"
#include "confdefs.h"
#include <linux/version.h>
#if LINUX_VERSION_CODE < $decnum
@@ -188,7 +189,7 @@ if test $host = $build; then
ac_prefix=$ac_default_prefix
fi
echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6
-echo "configure:192: checking for symlinks in ${ac_prefix}/include" >&5
+echo "configure:193: checking for symlinks in ${ac_prefix}/include" >&5
ac_message=
if test -L ${ac_prefix}/include/net; then
ac_message="$ac_message
diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index e89d8b4c1b..2ed2c096d8 100644
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -38,29 +38,30 @@ fi
# If the user gave a minimal version number test whether the available
# kernel headers are young enough. Additionally we have minimal
# kernel versions for some architectures.
+case "$machine" in
+ sh*)
+ arch_minimum_kernel=2.3.99
+ ;;
+ ia64*)
+ arch_minimum_kernel=2.4.0
+ ;;
+ *)
+ arch_minimum_kernel=2.0.10
+ ;;
+esac
if test -n "$minimum_kernel"; then
- case "$machine" in
- sh*)
- arch_minimum_kernel=2.3.99
- ;;
- *)
- ;;
- esac
-
- user_version=$((`echo $minimum_kernel.0.0.0 | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
- arch_version=$((`echo $arch_minimum_kernel.0.0.0 | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
- if test $user_version -lt $arch_minimum_kernel; then
+ changequote(,)
+ user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
+ arch_version=$((`echo "$arch_minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
+ changequote([,])
+ if test $user_version -lt $arch_version; then
AC_MSG_WARN([minimum kernel version reset to $arch_minimum_kernel])
minimum_kernel=$arch_minimum_kernel
fi
else
- case "$machine" in
- sh*)
- minimum_kernel = 2.3.99
- ;;
- *)
- ;;
- esac
+ if test $arch_minimum_kernel != '2.0.10'; then
+ minimum_kernel=$arch_minimum_kernel
+ fi
fi
if test -n "$minimum_kernel"; then