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

diff --git a/config/ChangeLog b/config/ChangeLog
index 7aaf7cae36a06f16b09f9f5069df8a2fd86bb269..46070e8c3c998642e25241960cb4def12a8b2f1f 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-21  David Daney  <ddaney@avtrex.com>
+
+       PR libgcj/28426
+       * gxx-include-dir.m4: Use target_alias in path for cross build.
+
 2006-07-18  Paolo Bonzini  <bonzini@gnu.org>
 
         * acx.m4: Support --with-build-libsubdir and AC_SUBST

diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4
index 0e6e4ffc397500e46cee0074e97e37a32d716e2b..4f54d427f7e2af158ec2946dd4376490b78670d7 100644 (file)
--- a/config/gxx-include-dir.m4
+++ b/config/gxx-include-dir.m4
@@ -17,7 +17,13 @@ case "${with_gxx_include_dir}" in
       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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e793eea2397df3579bd39d356d3f14099e286eda..de606684670325d6385f29abc5ad5abcae7d7227 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-21  David Daney  <ddaney@avtrex.com>
+
+       PR libgcj/28426
+       * configure: Regenerated.
+
 2006-07-21  Mark Wielaard  <mark@klomp.org>
 
        * java/io/OutputStreamWriter.java (flush): Create work if null.

diff --git a/libjava/configure b/libjava/configure
index abdda6d87f8275df8569350047fbc076bc308636..c2c5ddc8e61a8465245a1e98ee43eeacbadf8f90 100755 (executable)
--- 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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ce07b45e897c88cab66f20fa2fbff1cf0027a83b..b16d571d3ace32bf03fd34d00253a11c5f5fc37c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-21  David Daney  <ddaney@avtrex.com>
+
+       PR libgcj/28426
+       * acinclude.m4: Added a comment.
+
 2006-07-20  Benjamin Kosnik  <bkoz@redhat.com>
            Jakub Jelinek  <jakub@redhat.com>
        

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index a15e351fc0ced9fa94d336804efab0b6f5c63382..e5020593598fe06caffae8d271dcea5abae58638 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -675,6 +675,7 @@ dnl Assumes cross_compiling bits already done, and with_cross_host in
 dnl particular.
 dnl
 dnl This logic must match gcc/configure.ac's setting of gcc_gxx_include_dir.
+dnl config/gxx-include-dir.m4 must be kept consistant with this as well.
 AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
   glibcxx_toolexecdir=no
   glibcxx_toolexeclibdir=no