* configure.ac: Include multi.m4 and do not call AC_CANONICAL_SYSTEM.

	* configure: Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149594 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 18 insertions, 6 deletions

diff --git a/libada/ChangeLog b/libada/ChangeLog
index b23aa8e7b859..fc48aa148ddb 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* configure.ac: Include multi.m4 and do not call AC_CANONICAL_SYSTEM.
+	* configure: Regenerate.
+
 2009-04-09  Jakub Jelinek  <jakub@redhat.com>
 
 	* Makefile.in: Change copyright header to refer to version
diff --git a/libada/configure b/libada/configure
index 56a4b4811364..bd42f9ab622a 100755
--- a/libada/configure
+++ b/libada/configure
@@ -1388,6 +1388,7 @@ test -n "$target_alias" &&
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
+target_alias=${target_alias-$host_alias}
 
 # Determine the noncanonical target name, for directory use.
  case ${build_alias} in
@@ -1457,9 +1458,6 @@ else
   MAINT='#'
 fi;
 
-
-target_alias=${target_alias-$host_alias}
-
 # Default to --enable-multilib
 # Check whether --enable-multilib or --disable-multilib was given.
 if test "${enable_multilib+set}" = set; then
@@ -1490,6 +1488,13 @@ else
 fi
 
 
+# Even if the default multilib is not a cross compilation,
+# it may be that some of the other multilibs are.
+if test $cross_compiling = no && test $multilib = yes \
+   && test "x${with_multisubdir}" != x ; then
+   cross_compiling=maybe
+fi
+
           ac_config_commands="$ac_config_commands default-1"
 
 # Calculate toolexeclibdir
@@ -3823,6 +3828,9 @@ ac_configure_args="${multilib_arg} ${ac_configure_args}"
 multi_basedir="$multi_basedir"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 CC="$CC"
+CXX="$CXX"
+GFORTRAN="$GFORTRAN"
+GCJ="$GCJ"
 
 _ACEOF
 
diff --git a/libada/configure.ac b/libada/configure.ac
index 9cee1a0e7b8c..12de5479e005 100644
--- a/libada/configure.ac
+++ b/libada/configure.ac
@@ -16,6 +16,7 @@
 # <http://www.gnu.org/licenses/>.
 
 sinclude(../config/acx.m4)
+sinclude(../config/multi.m4)
 sinclude(../config/override.m4)
 
 AC_INIT
@@ -27,6 +28,7 @@ AC_CONFIG_SRCDIR([Makefile.in])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
+target_alias=${target_alias-$host_alias}
 
 # Determine the noncanonical target name, for directory use.
 ACX_NONCANONICAL_TARGET
@@ -49,9 +51,6 @@ AC_ARG_ENABLE([maintainer-mode],
   [MAINT='#'])
 AC_SUBST([MAINT])dnl
 
-AC_CANONICAL_SYSTEM
-target_alias=${target_alias-$host_alias}
-
 AM_ENABLE_MULTILIB(, ..)
 # Calculate toolexeclibdir
 # Also toolexecdir, though it's only used in toolexeclibdir