From 505692b0cd8319bb23012fd510d0f26cebccea87 Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@avtrex.com>
Date: Fri, 21 Jul 2006 20:49:06 +0000
Subject: re PR libgcj/28426 (libgcj header files installed in wrong location
 in cross build)

libstdc++-v3/
	PR libgcj/28426
	* acinclude.m4: Added a comment.
config/
	PR libgcj/28426
	* gxx-include-dir.m4: Use target_alias in path for cross build.
libjava/
	PR libgcj/28426
	* configure: Regenerated.

From-SVN: r115650
---
 libjava/configure | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'libjava/configure')

diff --git a/libjava/configure b/libjava/configure
index abdda6d..c2c5ddc 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -15055,7 +15055,13 @@ echo "$as_me: error: --with-gxx-include-dir=[dir] requires a directory" >&2;}
       yes) gxx_include_dir='$(libsubdir)/include/c++' ;;
       *)
 	libstdcxx_incdir='c++/$(gcc_version)'
-	gxx_include_dir='$(prefix)/include/$(libstdcxx_incdir)' ;;
+	gxx_include_dir='include/$(libstdcxx_incdir)'
+	if test -n "$with_cross_host" &&
+           test x"$with_cross_host" != x"no"; then
+          gxx_include_dir='${prefix}/${target_alias}/'"$gxx_include_dir"
+        else
+          gxx_include_dir='${prefix}/'"$gxx_include_dir"
+        fi;;
     esac ;;
   *) gxx_include_dir=${with_gxx_include_dir} ;;
 esac
-- 
cgit v1.1