From 80bf9cff52f780dd79f24a985f8512e610801eac Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 24 Aug 2007 18:05:54 +0000 Subject: [PATCH] acinclude.m4: Fix duplicate variable names. 2007-08-24 Benjamin Kosnik * acinclude.m4: Fix duplicate variable names. * configure: Regenerate. From-SVN: r127784 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/acinclude.m4 | 8 ++++---- libstdc++-v3/configure | 12 ++++++------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9dcc664cbec..1be5c507b5d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2007-08-24 Benjamin Kosnik + + * acinclude.m4: Fix duplicate variable names. + * configure: Regenerate. + 2007-08-24 Benjamin Kosnik * acinclude.m4 (GLIBCXX_CHECK_SYSTEM_ERROR): Add ENOLINK, EPROTO diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index c50dacd903c..390d450a71f 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1303,12 +1303,12 @@ AC_DEFUN([GLIBCXX_CHECK_SYSTEM_ERROR], [ fi AC_MSG_CHECKING([for sys_nerr]) - AC_CACHE_VAL(ac_system_error3, [ + AC_CACHE_VAL(ac_system_error9, [ AC_TRY_COMPILE([#include ], [ int i = sys_nerr; ], - [ac_system_error3=yes], [ac_system_error3=no]) + [ac_system_error9=yes], [ac_system_error9=no]) ]) - AC_MSG_RESULT($ac_system_error3) - if test x"$ac_system_error3" = x"yes"; then + AC_MSG_RESULT($ac_system_error9) + if test x"$ac_system_error9" = x"yes"; then AC_DEFINE(HAVE_SYS_NERR, 1, [Define if sys_nerr exists.]) fi ]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 4658205d751..01d905af755 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -16791,7 +16791,7 @@ _ACEOF echo "$as_me:$LINENO: checking for sys_nerr" >&5 echo $ECHO_N "checking for sys_nerr... $ECHO_C" >&6 - if test "${ac_system_error3+set}" = set; then + if test "${ac_system_error9+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16832,20 +16832,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_system_error3=yes + ac_system_error9=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_system_error3=no +ac_system_error9=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:$LINENO: result: $ac_system_error3" >&5 -echo "${ECHO_T}$ac_system_error3" >&6 - if test x"$ac_system_error3" = x"yes"; then + echo "$as_me:$LINENO: result: $ac_system_error9" >&5 +echo "${ECHO_T}$ac_system_error9" >&6 + if test x"$ac_system_error9" = x"yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_NERR 1