From e5aa91c34ac93ad91b910b55fd8781c267a81780 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 28 Feb 2000 07:41:22 +0000
Subject: [PATCH] Update.

2000-02-28  Andreas Jaeger  <aj@suse.de>

	* stdlib/canonicalize.c: Include <stddef.h> for ptrdiff_t.
---
 ChangeLog                         | 4 ++++
 configure                         | 5 +++--
 stdlib/canonicalize.c             | 1 +
 sysdeps/unix/sysv/linux/configure | 6 +++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83ecb8f..aa6e20a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-28  Andreas Jaeger  <aj@suse.de>
+
+	* stdlib/canonicalize.c: Include <stddef.h> for ptrdiff_t.
+
 2000-02-27  Ulrich Drepper  <drepper@redhat.com>
 
 	* conform/conformtest.pl (@headers): Add wordexp.h, wctype.h, wchar.h,
diff --git a/configure b/configure
index 0e17eb4..52ee0e8 100755
--- a/configure
+++ b/configure
@@ -1599,7 +1599,7 @@ echo "configure:1599: checking version of $SED" >&5
   ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
   case $ac_prog_version in
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-    3.02)
+    3.0[2-9]|3.[1-9]*|[4-9]*)
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 
@@ -3209,6 +3209,7 @@ fi
 
 
 
+
   
 if test $gnu_ld = yes; then
   cat >> confdefs.h <<\EOF
@@ -3242,7 +3243,7 @@ if test $shared = default; then
 fi
 
 echo $ac_n "checking whether -fPIC is default""... $ac_c" 1>&6
-echo "configure:3246: checking whether -fPIC is default" >&5
+echo "configure:3247: checking whether -fPIC is default" >&5
 if eval "test \"\${pic_default+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c
index 762f161..e555b02 100644
--- a/stdlib/canonicalize.c
+++ b/stdlib/canonicalize.c
@@ -24,6 +24,7 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
+#include <stddef.h>
 
 /* Return the canonical absolute name of file NAME.  A canonical name
    does not contain any `.', `..' components nor any repeated path
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index e505e87..ec4f214 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -13,7 +13,7 @@ if test -n "$sysheaders"; then
 fi
 echo $ac_n "checking installed Linux kernel header files""... $ac_c" 1>&6
 echo "configure:16: checking installed Linux kernel header files" >&5
-if eval "test \"`echo '$''{'libc_cv_linux2010'+set}'`\" = set"; then
+if eval "test \"\${libc_cv_linux2010+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
@@ -91,7 +91,7 @@ fi
 # files.  I.e., when the installation prefix is "/usr" we have to place
 # shared library objects and the configuration files on the root partition
 # in /lib and /etc.
-if test "$prefix" = "/usr"; then
+if test "$prefix" = "/usr" -o "$prefix" = "/usr/"; then
   # 64bit libraries on sparc go to /lib64 and not /lib
   if test "$machine" = "sparc/sparc64"; then
     libc_cv_slibdir="/lib64"
@@ -172,7 +172,7 @@ if test $host = $build; then
     ac_prefix=$ac_default_prefix
   fi
   echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6
-echo "configure:174: checking for symlinks in ${ac_prefix}/include" >&5
+echo "configure:176: checking for symlinks in ${ac_prefix}/include" >&5
   ac_message=
   if test -L ${ac_prefix}/include/net; then
     ac_message="$ac_message
-- 
2.7.4