1998-05-25  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* configure.in: Allow more make versions e.g 3.76.90.
This commit is contained in:
Ulrich Drepper 1998-05-25 11:34:09 +00:00
parent e72bfd87ec
commit 6598ac3031
9 changed files with 21 additions and 57 deletions

View File

@ -1,3 +1,7 @@
1998-05-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* configure.in: Allow more make versions e.g 3.76.90.
1998-05-25 Ulrich Drepper <drepper@cygnus.com>
* Makeconfig (rpath-link): Find libc.so.6 in $(common-objdir).

View File

@ -452,7 +452,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
critic_missing=t)
AC_CHECK_PROG_VER(MAKE, make gmake, --version,
[version \([0-9][0-9.]*\), by],
[3.75 | 3.76.[1-9] | 3.7[789]* | 3.[89]*], critic_missing=t)
[3.75 | 3.76.[1-9]* | 3.7[789]* | 3.[89]*], critic_missing=t)
AC_CHECK_PROG_VER(MSGFMT, msgfmt gmsgfmt, --version,
[GNU gettext.*\([0-9][0-9]*\.[0-9]*\)],

View File

@ -45,7 +45,7 @@ extra-libs = libdl
extra-libs-others = $(extra-libs)
libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr
before-compile = $(objpfx)trusted-dirs.h $(objpfx)rtldtbl.h
before-compile = $(objpfx)trusted-dirs.h
all: # Make this the default target; it will be defined in Rules.
@ -54,7 +54,7 @@ include ../Makeconfig
ifeq (yes,$(build-shared))
extra-objs = $(rtld-routines:=.os) soinit.os sofini.os eval.os interp.os
generated = librtld.os dl-allobjs.os ld.so trusted-dirs.h rtldtbl.h
generated = librtld.os dl-allobjs.os ld.so trusted-dirs.h trusted-dirs.st
install-others = $(inst_slibdir)/$(rtld-installed-name)
install-bin = ldd
generated += ldd
@ -135,17 +135,15 @@ endif
# libraries when using LD_LIBRARY_PATH in a setuid program. The user can
# add directories to the list by defining $(user-defined-trusted-dirs)
# before starting make.
$(objpfx)trusted-dirs.h: Makefile $(..)Makeconfig
$(objpfx)trusted-dirs.h: $(objpfx)trusted-dirs.st; @:
$(objpfx)trusted-dirs.st: Makefile $(..)Makeconfig
$(make-target-directory)
(for dir in `echo "$(default-rpath) $(user-defined-trusted-dirs)" | \
sed 's/:/ /g'`; do \
echo " \"$$dir/\","; \
done;) > $@T
mv -f $@T $@
$(objpfx)rtldtbl.h: Makefile $(..)Makeconfig genrtldtbl.awk
$(make-target-directory)
echo "$(default-rpath)" | $(AWK) -f genrtldtbl.awk > $@T
mv -f $@T $@
dirs="$(subst :, ,$(default-rpath) $(user-defined-trusted-dirs))"; \
for dir in $$dirs; do \
echo " \"$$dir/\","; \
done > ${@:st=T}
$(move-if-change) ${@:st=T} ${@:st=h}
touch $@
CPPFLAGS-dl-load.c = -I$(objpfx).
CFLAGS-dl-load.c += -Wno-uninitialized

View File

@ -224,7 +224,6 @@ install-others = $(addprefix $(inst_gconvdir)/, $(modules.so)) \
# If we have the localedata add-on available we can build the conversion
# tables for numerous charsets.
move-if-change = ./$(..)scripts/move-if-change
define generate-8bit-table
$(make-target-directory)

View File

@ -65,7 +65,9 @@ mv -f $@.new $@
endef
# scripts we use
move-if-change = $(..)scripts/move-if-change
ifndef move-if-change
move-if-change = ./move-if-change
endif
mkinstalldirs = $(..)scripts/mkinstalldirs
libc.dvi libc.info: $(chapters) summary.texi $(chapters-incl)

View File

@ -39,7 +39,7 @@ extra-objs = $(patsubst %,onlymd5-entry%,$(object-suffixes))
include ../Makeconfig
rpath-link := $(common-objpfx)md5-crypt:$(rpath-link)
rpath-dirs += md5-crypt
ifeq ($(crypt-in-libc),yes)
routines += $(libcrypt-routines)

View File

@ -134,7 +134,6 @@ $(inst_sysconfdir)/rpc: etc.rpc $(+force)
# Generate the rpcsvc headers with rpcgen.
# We use a stamp file to avoid unnessary recompilation each time rpcgen is
# relinked.
move-if-change = ./$(..)scripts/move-if-change
$(rpcsvc:%.x=$(objpfx)rpcsvc/%.h): $(objpfx)rpcsvc/%.h: $(objpfx)rpcsvc/%.stmp
@:
$(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(objpfx)rpcgen

View File

@ -1,38 +0,0 @@
/* Set floating-point environment exception handling.
Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <fenv.h>
#include <math.h>
#include <fpu_control.h>
void
fesetexceptflag (const fexcept_t *flagp, int excepts)
{
fexcept_t temp;
/* Get the current environment. */
_FPU_GETCW(temp);
/* Set the desired exception mask. */
temp &= ~((excepts & FE_ALL_EXCEPT) << FE_EXCEPT_SHIFT);
temp |= (*flagp & excepts & FE_ALL_EXCEPT) << FE_EXCEPT_SHIFT;
/* Save state back to the FPU. */
_FPU_SETCW(temp);
}

View File

@ -90,7 +90,7 @@ $(common-objpfx)stamp-errnos: $(hurd)/errnos.awk $(errno.texinfo) \
$(AWK) -f $^ > $(hurd)/errnos.h-tmp
# Make it unwritable so noone will edit it by mistake.
-chmod a-w $(hurd)/errnos.h-tmp
./$(..)scripts/move-if-change $(hurd)/errnos.h-tmp $(hurd)/errnos.h
$(move-if-change) $(hurd)/errnos.h-tmp $(hurd)/errnos.h
ifeq ($(with-cvs),yes)
test ! -d $(hurd)/CVS || \
(cd $(hurd) && cvs commit -m'Regenerated from $^' errnos.h)
@ -114,7 +114,7 @@ endif
rpcuserlibs := $(common-objpfx)mach/libmachuser.so \
$(common-objpfx)hurd/libhurduser.so
$(common-objpfx)libc.so: $(rpcuserlibs)
rpath-link := $(rpath-link):$(common-objpfx)mach:$(common-objpfx)hurd
rpath-dirs += mach hurd
# And get them into the libc.so ldscript.
$(inst_libdir)/libc.so: $(rpcuserlibs)