acinclude.m4 (glibcpp_toolexeclibdir): Fix test for cross compilation.

2001-02-15  Anthony Green  <green@redhat.com>

        * acinclude.m4 (glibcpp_toolexeclibdir): Fix test for cross
        compilation.
        * aclocal.m4: Regenerate.
        * configure: Regenerate.

From-SVN: r39735

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index eef8140eeddfef878fcfd024bf32a3501942f2e8..e6bc02a02e561100e75d9b3a619e5633e8269a35 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-15  Anthony Green  <green@redhat.com>
+
+        * acinclude.m4 (glibcpp_toolexeclibdir): Fix test for cross
+        compilation.
+        * aclocal.m4: Regenerate.
+        * configure: Regenerate.
+
 2001-02-15  Rodney Brown  <RodneyBrown@mynd.com>
 
         * acinclude.m4 (GLIBCPP_CHECK_MATH_DECL_1):

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 81ef3c09030088d5de19a0030f348160efe111e7..0c87780ccb2a48b39ae821af00d020361e88bbdf 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1569,7 +1569,7 @@ fi
 # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
 # Install a library built with a cross compiler in tooldir, not libdir.
 if test x"$glibcpp_toolexecdir" = x"no"; then 
-  if test x"$with_cross_host" = x"yes"; then
+  if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then
     glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
     glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)'
   else

diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index d92314c5de99ad3699a6455680fba5c1cbe812bb..a4a5e0ade430087b079925b93c5e10d7cb449a47 100644 (file)
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1581,7 +1581,7 @@ fi
 # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
 # Install a library built with a cross compiler in tooldir, not libdir.
 if test x"$glibcpp_toolexecdir" = x"no"; then 
-  if test x"$with_cross_host" = x"yes"; then
+  if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then
     glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
     glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)'
   else

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 4cfd4657aa4a1bc950bb9442fb29be92cacff28b..e74ea1bf88b0358c7f1f0874eb4d84233736f9f4 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -15954,7 +15954,7 @@ fi
 # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
 # Install a library built with a cross compiler in tooldir, not libdir.
 if test x"$glibcpp_toolexecdir" = x"no"; then 
-  if test x"$with_cross_host" = x"yes"; then
+  if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then
     glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
     glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)'
   else