From 62ab42d67da471a5502ecbe556e7f621dae360d3 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 5 Dec 2000 00:41:57 +0000
Subject: [PATCH] Update.

2000-12-04  H.J. Lu  <hjl@gnu.org>

	* configure.in: Change --with-oldest-abi=ABI to
	--enable-oldest-abi=ABI.

2000-12-02  Bruno Haible  <haible@clisp.cons.org>

	* stdio-common/perror.c (perror): If stderr is wide-oriented, use
	fwprintf instead of fprintf.

2000-12-01  H.J. Lu  <hjl@gnu.org>

	* nss/getXXbyYY_r.c: Fix verioned symbol handling.
	* nss/getXXent_r.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/chown.c: Likewise.

2000-11-30  H.J. Lu  <hjl@gnu.org>

	* scripts/abi-versions.awk (oldest_abi): New variable.
	Handle the oldest ABI supported.

	* Makerules ($(common-objpfx)abi-versions.h): Set oldest_abi
	for scripts/abi-versions.awk.

	* configure.in: Add --with-oldest-abi=ABI.
	* configure: Rebuild.

	* config.make.in (oldest-abi): New.

	* config.h.in (GLIBC_OLDEST_ABI): New.

	* csu/version.c (banner): Support GLIBC_OLDEST_ABI.
---
 ChangeLog             | 33 +++++++++++++++++++++++++++++++++
 configure             | 42 +++++++++++++++++++++---------------------
 configure.in          | 22 +++++++++++-----------
 stdio-common/perror.c | 14 ++++++++++----
 4 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3cd9df08a..8b4f4d8883 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-04  H.J. Lu  <hjl@gnu.org>
+
+	* configure.in: Change --with-oldest-abi=ABI to
+	--enable-oldest-abi=ABI.
+
+2000-12-02  Bruno Haible  <haible@clisp.cons.org>
+
+	* stdio-common/perror.c (perror): If stderr is wide-oriented, use
+	fwprintf instead of fprintf.
+
 2000-12-04  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/alpha/fpu/bits/mathdef.h: Remove FLT_EVAL_METHOD and
@@ -87,6 +97,29 @@
 
 	* stdio-common/vfscanf.c (ORIENT): Swap the COMPILE_WSCANF case.
 
+2000-12-01  H.J. Lu  <hjl@gnu.org>
+
+	* nss/getXXbyYY_r.c: Fix verioned symbol handling.
+	* nss/getXXent_r.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/chown.c: Likewise.
+
+2000-11-30  H.J. Lu  <hjl@gnu.org>
+
+	* scripts/abi-versions.awk (oldest_abi): New variable.
+	Handle the oldest ABI supported.
+
+	* Makerules ($(common-objpfx)abi-versions.h): Set oldest_abi
+	for scripts/abi-versions.awk.
+
+	* configure.in: Add --with-oldest-abi=ABI.
+	* configure: Rebuild.
+
+	* config.make.in (oldest-abi): New.
+
+	* config.h.in (GLIBC_OLDEST_ABI): New.
+
+	* csu/version.c (banner): Support GLIBC_OLDEST_ABI.
+
 2000-11-30  Jakub Jelinek  <jakub@redhat.com>
 
 	* locale/setlocale.c (setname): Free for all categories, not just
diff --git a/configure b/configure
index 8b884fe71d..309d4e2078 100755
--- a/configure
+++ b/configure
@@ -42,9 +42,6 @@ ac_help="$ac_help
   --with-headers=PATH     location of system headers to use
                           [e.g. /usr/src/linux/include]
                           [default=compiler default]"
-ac_help="$ac_help
-  --with-oldest-abi=ABI   the oldest ABI supported [e.g. 2.2]
-                          [default=glibc default]"
 ac_help="$ac_help
   --enable-libio          build in GNU libio instead of GNU stdio"
 ac_help="$ac_help
@@ -61,6 +58,9 @@ ac_help="$ac_help
 ac_help="$ac_help
   --disable-versioning    do not include versioning information in the
                           library objects [default=yes if supported]"
+ac_help="$ac_help
+  --enable-oldest-abi=ABI configure the oldest ABI supported [e.g. 2.2]
+                          [default=glibc default]"
 ac_help="$ac_help
   --enable-add-ons[=DIR1,DIR2]...
 			  configure and build add-ons in DIR1,DIR2,...
@@ -721,24 +721,6 @@ else
 fi
 
 
-# Check whether --with-oldest-abi or --without-oldest-abi was given.
-if test "${with_oldest_abi+set}" = set; then
-  withval="$with_oldest_abi"
-  oldest_abi=$withval
-else
-  oldest_abi=''
-fi
-
-if test ! -z "$oldest_abi"; then
-  cat >> confdefs.h <<EOF
-#define GLIBC_OLDEST_ABI "$oldest_abi"
-EOF
-
-else
-  oldest_abi=default
-fi
-
-
 # Check whether --enable-libio or --disable-libio was given.
 if test "${enable_libio+set}" = set; then
   enableval="$enable_libio"
@@ -803,6 +785,24 @@ else
 fi
 
 
+# Check whether --enable-oldest-abi or --disable-oldest-abi was given.
+if test "${enable_oldest_abi+set}" = set; then
+  enableval="$enable_oldest_abi"
+  oldest_abi=$enableval
+else
+  oldest_abi=no
+fi
+
+if test "$oldest_abi" = yes || test "$oldest_abi" = no; then
+  oldest_abi=default
+else
+  cat >> confdefs.h <<EOF
+#define GLIBC_OLDEST_ABI "$oldest_abi"
+EOF
+
+fi
+
+
 # Check whether --enable-add-ons or --disable-add-ons was given.
 if test "${enable_add_ons+set}" = set; then
   enableval="$enable_add_ons"
diff --git a/configure.in b/configure.in
index ed15555834..76d88faf5b 100644
--- a/configure.in
+++ b/configure.in
@@ -82,17 +82,6 @@ AC_ARG_WITH(headers, dnl
                           [default=compiler default]],
 	    sysheaders=$withval, sysheaders='')
 
-AC_ARG_WITH(oldest-abi, dnl
-[  --with-oldest-abi=ABI   the oldest ABI supported [e.g. 2.2]
-                          [default=glibc default]],
-	    oldest_abi=$withval, oldest_abi='')
-if test ! -z "$oldest_abi"; then
-  AC_DEFINE_UNQUOTED(GLIBC_OLDEST_ABI, "$oldest_abi")
-else
-  oldest_abi=default
-fi
-AC_SUBST(oldest_abi)
-
 AC_ARG_ENABLE(libio, dnl
 [  --enable-libio          build in GNU libio instead of GNU stdio],
  	      [if test $enableval = yes; then
@@ -132,6 +121,17 @@ AC_ARG_ENABLE(versioning, dnl
                           library objects [default=yes if supported]],
              enable_versioning=$enableval, enable_versioning=yes)
 
+AC_ARG_ENABLE(oldest-abi, dnl
+[  --enable-oldest-abi=ABI configure the oldest ABI supported [e.g. 2.2]
+                          [default=glibc default]],
+	    oldest_abi=$enableval, oldest_abi=no)
+if test "$oldest_abi" = yes || test "$oldest_abi" = no; then
+  oldest_abi=default
+else
+  AC_DEFINE_UNQUOTED(GLIBC_OLDEST_ABI, "$oldest_abi")
+fi
+AC_SUBST(oldest_abi)
+
 dnl Generic infrastructure for drop-in additions to libc.
 AC_ARG_ENABLE(add-ons, dnl
 [  --enable-add-ons[=DIR1,DIR2]...
diff --git a/stdio-common/perror.c b/stdio-common/perror.c
index 4c29cb09e1..239d43edc6 100644
--- a/stdio-common/perror.c
+++ b/stdio-common/perror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1993,1997,1998,2000 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
@@ -16,9 +16,10 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
+#include <wchar.h>
 
 /* Print a line on stderr consisting of the text in S, a colon, a space,
    a message describing the meaning of the contents of `errno' and a newline.
@@ -29,12 +30,17 @@ perror (const char *s)
   char buf[1024];
   int errnum = errno;
   const char *colon;
+  const char *errstring;
 
   if (s == NULL || *s == '\0')
     s = colon = "";
   else
     colon = ": ";
 
-  (void) fprintf (stderr, "%s%s%s\n",
-		  s, colon, __strerror_r (errnum, buf, sizeof buf));
+  errstring = __strerror_r (errnum, buf, sizeof buf);
+
+  if (fwide (stderr, 0) > 0)
+    (void) fwprintf (stderr, L"%s%s%s\n", s, colon, errstring);
+  else
+    (void) fprintf (stderr, "%s%s%s\n", s, colon, errstring);
 }