* build fix

2001-09-23  Frank Ch. Eigler  <fche@redhat.com>

	* libstdc++.m4: Reject shared libstdc++ possibility if g++ replies with
	no path to "--print-file-name=libstdc++.a".

diff --git a/sid/aclocal.m4 b/sid/aclocal.m4
index e51077b..92e1f6a 100644 (file)
--- a/sid/aclocal.m4
+++ b/sid/aclocal.m4
@@ -281,7 +281,7 @@ else
   # The heuristics are meant to detect and prevent the case where the host may
   # have *some other* shared libstdc++.so installed, say in /usr/lib, even though
   # the compiler only came with a libstdc++.a in some other directory.
-  if test "x$gxx_shlibdir" != "x" -a "x$gxx_stlibdir" = "x$gxx_shlibdir"
+  if test "x$gxx_shlibdir" != "x" -a "x$gxx_shlibdir" != "x." -a "x$gxx_stlibdir" = "x$gxx_shlibdir"
   then
     have_libstdcxx_shared=yes
   else

diff --git a/sid/config/ChangeLog b/sid/config/ChangeLog
index 814d652..670fef6 100644 (file)
--- a/sid/config/ChangeLog
+++ b/sid/config/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-23  Frank Ch. Eigler  <fche@redhat.com>
+
+       * libstdc++.m4: Reject shared libstdc++ possibility if g++ replies with
+       no path to "--print-file-name=libstdc++.a".
+
 2001-07-11  Frank Ch. Eigler  <fche@redhat.com>
 
        * Makefile.docs: Support xsltproc; prefer it to sabcmd.

diff --git a/sid/config/libstdc++.m4 b/sid/config/libstdc++.m4
index 88d55b6..c3ee872 100644 (file)
--- a/sid/config/libstdc++.m4
+++ b/sid/config/libstdc++.m4
@@ -43,7 +43,7 @@ else
   # The heuristics are meant to detect and prevent the case where the host may
   # have *some other* shared libstdc++.so installed, say in /usr/lib, even though
   # the compiler only came with a libstdc++.a in some other directory.
-  if test "x$gxx_shlibdir" != "x" -a "x$gxx_stlibdir" = "x$gxx_shlibdir"
+  if test "x$gxx_shlibdir" != "x" -a "x$gxx_shlibdir" != "x." -a "x$gxx_stlibdir" = "x$gxx_shlibdir"
   then
     have_libstdcxx_shared=yes
   else

diff --git a/sid/configure b/sid/configure
index c0c4852..dec0436 100755 (executable)
--- a/sid/configure
+++ b/sid/configure
@@ -1547,7 +1547,7 @@ echo "configure:1523: checking for libstdc++ {static/shared}" >&5
   # The heuristics are meant to detect and prevent the case where the host may
   # have *some other* shared libstdc++.so installed, say in /usr/lib, even though
   # the compiler only came with a libstdc++.a in some other directory.
-  if test "x$gxx_shlibdir" != "x" -a "x$gxx_stlibdir" = "x$gxx_shlibdir"
+  if test "x$gxx_shlibdir" != "x" -a "x$gxx_shlibdir" != "x." -a "x$gxx_stlibdir" = "x$gxx_shlibdir"
   then
     have_libstdcxx_shared=yes
   else