Subject: avoid redundant rpath entries on multiarch systems

 * src/build-system/configure(.ac): when ensuring that executables
   will be able to find libstdc++, don't add rpath entries that files
   under /etc/ld.so.conf.d already specify, even if they don't resemble
   traditional single-architecture or biarch locations.

Debian-Bug: 633567.
Author: Aaron M. Ucko <ucko@debian.org>
Last-Update: 2011-08-28
Index: b/c++/src/build-system/configure
===================================================================
--- a/c++/src/build-system/configure	2011-08-28 11:41:27.000000000 -0400
+++ b/c++/src/build-system/configure	2011-08-28 11:48:06.000000000 -0400
@@ -5613,7 +5613,7 @@
                break
                ;;
             /* )
-               found=true
+               fgrep -qsx $abs_dir /etc/ld.so.conf.d/*  ||  found=true
                break
                ;;
         esac
Index: b/c++/src/build-system/configure.ac
===================================================================
--- a/c++/src/build-system/configure.ac	2011-08-28 11:41:27.000000000 -0400
+++ b/c++/src/build-system/configure.ac	2011-08-28 11:48:11.000000000 -0400
@@ -1494,7 +1494,7 @@
                break
                ;;
             /* )
-               found=true
+               fgrep -qsx $abs_dir /etc/ld.so.conf.d/*  ||  found=true
                break
                ;;
         esac
