2005-04-27 Paolo Bonzini <bonzini@gnu.org>

[pf3gnuchains/gcc-fork.git] / config / acx.m4

diff --git a/config/acx.m4 b/config/acx.m4
index d4a583d..6d3e6d5 100644 (file)
--- a/config/acx.m4
+++ b/config/acx.m4
@@ -76,8 +76,13 @@ AC_DEFUN([GCC_TOPLEV_SUBDIRS],
 AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
 # Prefix 'build-' so this never conflicts with target_subdir.
 build_subdir="build-${build_noncanonical}"
-# Not really a subdirectory, but here for completeness.
-host_subdir=.
+# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
+if ( test $srcdir = . && test -d gcc ) \
+   || test -d $srcdir/../host-${host_noncanonical}; then
+  host_subdir="host-${host_noncanonical}"
+else
+  host_subdir=.
+fi
 # No prefix.
 target_subdir=${target_noncanonical}
 AC_SUBST([build_subdir]) []dnl