* aclocal.m4: Add provide for AC_CONFIG_AUX_DIR_DEFAULT.

	* Makeconfig ($(common-objpfx)shlib-versions.v.i): Move top-level
	$(..)shlib-versions file to last in deps list.  This lets add-ons give
	more-specific matches that override defaults in the top-level file.

	* 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/ChangeLog b/ChangeLog
index e0e5925..06d4c64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-07-01  Roland McGrath  <roland@redhat.com>
+
+       * aclocal.m4: Add provide for AC_CONFIG_AUX_DIR_DEFAULT.
+
+       * Makeconfig ($(common-objpfx)shlib-versions.v.i): Move top-level
+       $(..)shlib-versions file to last in deps list.  This lets add-ons give
+       more-specific matches that override defaults in the top-level file.
+
+       * 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.
+
 2004-07-01  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
        * sysdeps/s390/fpu/bits/mathinline.h [__LIBC_INTERNAL_MATH_INLINES]

diff --git a/Makeconfig b/Makeconfig
index 5a9f068..92501a7 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -792,10 +792,11 @@ ifeq (yes, $(build-shared))
 ifeq ($(sysd-sorted-done),t)
 -include $(common-objpfx)soversions.mk
 ifndef avoid-generated
+# This lets add-ons give more-specific matches that override defaults
+# in the top-level file.
 $(common-objpfx)shlib-versions.v.i: \
-       $(..)shlib-versions $(wildcard $(patsubst %, $(..)%/shlib-versions,\
-                                                    $(add-ons) \
-                                                    $(subdirs)))
+       $(wildcard $(patsubst %, $(..)%/shlib-versions,$(add-ons) $(subdirs)))\
+       $(..)shlib-versions
 $(common-objpfx)soversions.i: $(common-objpfx)shlib-versions.v
        default_setname='$(filter-out %_default,$(oldest-abi:%=GLIBC_%))'; \
        while read conf version setname; do \

diff --git a/aclocal.m4 b/aclocal.m4
index 7395ee8..4efa41e 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -4,6 +4,7 @@ dnl Each sysdep configure.in does GLIBC_PROVIDES first, to avoid any
 dnl AC_REQUIREs or AC_BEFOREs duplicating their code.
 dnl
 define([GLIBC_PROVIDES], [dnl
+AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_PROVIDE([_AS_ECHO_N_PREPARE])dnl
 AC_PROVIDE([_AS_CR_PREPARE])dnl
 AC_PROVIDE([_AS_TR_SH_PREPARE])dnl