Wed Mar 29 11:26:48 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

	More changes from Germano Caronni <caronni@tik.ethz.ch>:
	* malloc/free.c: Relocate _heapinfo when that allows us to return
 	core to the system.

	* malloc/malloc.c: Move #include <errno.h> outside #ifndef
	_MALLOC_INTERNAL.

2 files changed, 32 insertions, 29 deletions

diff --git a/sysdeps/generic/configure b/sysdeps/generic/configure
index c89b679eb9..132f26e82b 100755
--- a/sysdeps/generic/configure
+++ b/sysdeps/generic/configure
@@ -1,51 +1,54 @@
-# This file is generated from configure.in by Autoconf.  DO NOT EDIT!
  
-
-if [ ! "$inhibit_glue" ]; then
-
+if test -z "$inhibit_glue"; then
 # For signame.c, used in make_siglist.
 for ac_func in psignal
 do
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-echo "checking for ${ac_func}" 1>&4
-if eval "test \"`echo '${'ac_cv_func_${ac_func}'+set}'`\" = set"; then
-  echo "	using cached value for ac_cv_func_${ac_func}" 1>&5
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
+  cat > conftest.$ac_ext <<EOF
+#line 12 "configure"
 #include "confdefs.h"
-#include <ctype.h>
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+char $ac_func(); 
+
 int main() { return 0; }
-int t() { 
+int t() {
+
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_${ac_func}) || defined (__stub___${ac_func})
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char ${ac_func}(); ${ac_func}();
+$ac_func();
 #endif
+
 ; return 0; }
 EOF
-if eval $ac_compile; then
+if eval $ac_link; then
   rm -rf conftest*
-  eval "ac_cv_func_${ac_func}=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
-  eval "ac_cv_func_${ac_func}=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 
 fi
-if eval "test \"`echo '$ac_cv_func_'${ac_func}`\" = yes"; then
-  
-{
-test "$verbose" = yes && \
-echo "	defining ${ac_tr_func}"
-echo "#define" ${ac_tr_func} "1" >> confdefs.h
-DEFS="$DEFS -D${ac_tr_func}=1"
-}
-
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&4
+    ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&4
 fi
 done
 
diff --git a/sysdeps/unix/common/configure b/sysdeps/unix/common/configure
index b01c547c60..d5bfec8e62 100755
--- a/sysdeps/unix/common/configure
+++ b/sysdeps/unix/common/configure
@@ -3,7 +3,7 @@ if test -z "$inhibit_glue"; then
 
 # Find out what this system calls `sys_siglist'.
 echo $ac_n "checking for sys_siglist""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_check_symbol_sys_siglist'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_check_symbol_sys_siglist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
@@ -35,7 +35,7 @@ EOF
 fi
 echo "$ac_t""$ac_cv_check_symbol_sys_siglist" 1>&4
 echo $ac_n "checking for _sys_siglist""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_check_symbol__sys_siglist'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_check_symbol__sys_siglist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
@@ -70,7 +70,7 @@ echo "$ac_t""$ac_cv_check_symbol__sys_siglist" 1>&4
 # Find out the name of the table the system's <ctype.h> uses for character
 # classification.  This is used by sysdeps/unix/common/glue-ctype.c.
 echo $ac_n "checking ctype array name for glue""... $ac_c" 1>&4
-if eval "test \"`echo '${'libc_cv_ctype_glue'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'libc_cv_ctype_glue'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   for ctype in _ctype_ __ctype_ __ctype _ctype__ _ctype _locp; do