diff options
| author | Roland McGrath <roland@gnu.org> | 2004-07-20 22:14:59 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-07-20 22:14:59 +0000 |
| commit | 8f73811bcf9c1ef8044f28f384245b477b69cd31 (patch) | |
| tree | 85737ec0509c60d35f5a0174b1c29a65a1580324 /Makeconfig | |
| parent | 3a261340b81a5fdf901486d5cd333698474b489b (diff) | |
| download | glibc-8f73811bcf9c1ef8044f28f384245b477b69cd31.tar.gz glibc-8f73811bcf9c1ef8044f28f384245b477b69cd31.tar.xz glibc-8f73811bcf9c1ef8044f28f384245b477b69cd31.zip | |
* configure.in (add_ons): Substitute this. Move $add_ons handling
after AC_CANONICAL_HOST and default setting of $machine et al. Don't set $subdirs from $add_ons. Instead, source add-on/configure fragments early on. (base_machine): If it's already set, don't set it based on $machine. (libc_config_ok): New variable, set to no. If an add-on fragment sets it to yes, skip the tuple sanity check as if --enable-hacker-mode. (sysnames): Try appending add-on names after machine as well. * configure: Regenerated. * config.make.in (add-ons): Set from @add_ons@ instead of @subdirs@. * Makeconfig ($(common-objpfx)config.status): Also depend on configure files in $(add_ons) dirs. * sysdeps/unix/sysv/linux/bits/in.h (struct ip_mreq): Remove definition, now in netinet/in.h proper. long. Rewrite example code so that it takes into account l64a output
Diffstat (limited to 'Makeconfig')
| -rw-r--r-- | Makeconfig | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Makeconfig b/Makeconfig index 92501a78c0..0b8502192e 100644 --- a/Makeconfig +++ b/Makeconfig @@ -110,15 +110,19 @@ $(common-objpfx)config.make: $(common-objpfx)config.status \ $(..)config.make.in $(..)config.h.in cd $(<D); $(SHELL) $(<F) -# Find all the sysdeps configure fragments, to make sure we re-run -# configure when any of them changes. +# Find all the add-on and sysdeps configure fragments, to make sure we +# re-run configure when any of them changes. $(common-objpfx)config.status: $(..)version.h $(..)configure \ $(foreach dir,$(full_config_sysdirs),\ $(wildcard \ $(dir)/Implies) \ $(patsubst %.in,%,\ $(firstword $(wildcard \ - $(addprefix $(dir)/,configure configure.in))))) + $(addprefix $(dir)/,configure configure.in))))) \ + $(patsubst %.in,%,\ + $(foreach dir,$(add_ons),\ + $(firstword $(wildcard \ + $(addprefix $(..)$(dir)/,configure configure.in))))) @cd $(@D); if test -f $(@F); then exec $(SHELL) $(@F) --recheck; else \ echo The GNU C library has not been configured. >&2; \ echo Run \`configure\' to configure it before building. >&2; \ |