2004-07-13  Jakub Jelinek  <jakub@redhat.com>

	* acinclude.m4 (glibcpp_shared_libgcc): Correct
	glibcpp_shared_libgcc test for multilibs.
	* aclocal.m4: Rebuilt.
	* configure: Rebuilt.

--- libstdc++33-v3/acinclude.m4.jj	2004-06-24 18:06:53.000000000 +0200
+++ libstdc++33-v3/acinclude.m4	2004-08-18 10:28:50.333384148 +0200
@@ -2294,6 +2294,23 @@ if test $enable_symvers != no; then
   CFLAGS=' -lgcc_s'
   AC_TRY_LINK(, [return 0], glibcpp_shared_libgcc=yes, glibcpp_shared_libgcc=no)
   CFLAGS="$ac_save_CFLAGS"
+  if test $glibcpp_shared_libgcc = no; then
+    cat > conftest.c <<EOF
+int main (void) { return 0; }
+EOF
+changequote(,)dnl
+    glibcpp_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
+			     -shared -shared-libgcc -o conftest.so \
+			     conftest.c -v 2>&1 >/dev/null \
+			     | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
+changequote([,])dnl
+    rm -f conftest.c conftest.so
+    if test x${glibcpp_libgcc_s_suffix+set} = xset; then
+      CFLAGS=" -lgcc_s$glibcpp_libgcc_s_suffix"
+      AC_TRY_LINK(, [return 0;], glibcpp_shared_libgcc=yes)
+      CFLAGS="$ac_save_CFLAGS"
+    fi
+  fi
   AC_MSG_RESULT($glibcpp_shared_libgcc)
 fi
 
--- libstdc++33-v3/aclocal.m4.jj	2004-06-24 18:06:53.000000000 +0200
+++ libstdc++33-v3/aclocal.m4	2004-08-18 10:30:06.361019696 +0200
@@ -2306,6 +2306,23 @@ if test $enable_symvers != no; then
   CFLAGS=' -lgcc_s'
   AC_TRY_LINK(, [return 0], glibcpp_shared_libgcc=yes, glibcpp_shared_libgcc=no)
   CFLAGS="$ac_save_CFLAGS"
+  if test $glibcpp_shared_libgcc = no; then
+    cat > conftest.c <<EOF
+int main (void) { return 0; }
+EOF
+changequote(,)dnl
+    glibcpp_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
+			     -shared -shared-libgcc -o conftest.so \
+			     conftest.c -v 2>&1 >/dev/null \
+			     | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
+changequote([,])dnl
+    rm -f conftest.c conftest.so
+    if test x${glibcpp_libgcc_s_suffix+set} = xset; then
+      CFLAGS=" -lgcc_s$glibcpp_libgcc_s_suffix"
+      AC_TRY_LINK(, [return 0;], glibcpp_shared_libgcc=yes)
+      CFLAGS="$ac_save_CFLAGS"
+    fi
+  fi
   AC_MSG_RESULT($glibcpp_shared_libgcc)
 fi
 
--- libstdc++33-v3/configure.jj	2004-08-18 09:44:22.000000000 +0200
+++ libstdc++33-v3/configure	2004-08-18 10:31:41.502299528 +0200
@@ -23563,6 +23563,36 @@ else
 fi
 rm -f conftest*
   CFLAGS="$ac_save_CFLAGS"
+  if test $glibcpp_shared_libgcc = no; then
+    cat > conftest.c <<EOF
+int main (void) { return 0; }
+EOF
+    glibcpp_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
+			     -shared -shared-libgcc -o conftest.so \
+			     conftest.c -v 2>&1 >/dev/null \
+			     | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
+    rm -f conftest.c conftest.so
+    if test x${glibcpp_libgcc_s_suffix+set} = xset; then
+      CFLAGS=" -lgcc_s$glibcpp_libgcc_s_suffix"
+      cat > conftest.$ac_ext <<EOF
+#line 23579 "configure"
+#include "confdefs.h"
+
+int main() {
+return 0;
+; return 0; }
+EOF
+if { (eval echo configure:23586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  glibcpp_shared_libgcc=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+      CFLAGS="$ac_save_CFLAGS"
+    fi
+  fi
   echo "$ac_t""$glibcpp_shared_libgcc" 1>&6
 fi