2004-07-01 Roland McGrath <roland@redhat.com>

	* sysdeps/unix/sysv/linux/configure.in: If arch_minimum_kernel was
	already set, don't set it or libc_cv_gcc_unwind_find_fde.
	* sysdeps/unix/sysv/linux/configure: Regenerated.

diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 7d7d2d1c7ad579d1419cd477ae65dccaefd447ac..89484200ce610aa0f54a3c0881e1f24668b6d06b 100644 (file)
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -87,7 +87,11 @@ 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.
+# kernel versions for some architectures.  If a previous configure fragment
+# set arch_minimum_kernel already, let that override our defaults here.
+# Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde
+# if appropriate too.
+test -n "$arch_minimum_kernel" ||
 case "$machine" in
   alpha*)
     arch_minimum_kernel=2.1.100

diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index 818a59d2e49b4bfad89eed760ba464dc3faee2c9..f0a7fb123133485c84aa88f1745915ea1a178481 100644 (file)
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -46,7 +46,11 @@ 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.
+# kernel versions for some architectures.  If a previous configure fragment
+# set arch_minimum_kernel already, let that override our defaults here.
+# Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde
+# if appropriate too.
+test -n "$arch_minimum_kernel" ||
 case "$machine" in
   alpha*)
     arch_minimum_kernel=2.1.100