mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-27 13:54:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

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

From-SVN: r149594
This commit is contained in:
Eric Botcazou 2009-07-13 20:04:33 +00:00 committed by Eric Botcazou
parent 9122666ca8
commit 05682af89f
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libada/ChangeLog
View File

@ -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> 2009-04-09 Jakub Jelinek <jakub@redhat.com>
* Makefile.in: Change copyright header to refer to version * Makefile.in: Change copyright header to refer to version

14
libada/configure vendored
View File

@ -1388,6 +1388,7 @@ test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \ test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, && NONENONEs,x,x, &&
program_prefix=${target_alias}- program_prefix=${target_alias}-
target_alias=${target_alias-$host_alias}
# Determine the noncanonical target name, for directory use. # Determine the noncanonical target name, for directory use.
case ${build_alias} in case ${build_alias} in
@ -1457,9 +1458,6 @@ else
MAINT='#' MAINT='#'
fi; fi;
target_alias=${target_alias-$host_alias}
# Default to --enable-multilib # Default to --enable-multilib
# Check whether --enable-multilib or --disable-multilib was given. # Check whether --enable-multilib or --disable-multilib was given.
if test "${enable_multilib+set}" = set; then if test "${enable_multilib+set}" = set; then
@ -1490,6 +1488,13 @@ else
fi 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" ac_config_commands="$ac_config_commands default-1"
# Calculate toolexeclibdir # Calculate toolexeclibdir
@ -3823,6 +3828,9 @@ ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir" multi_basedir="$multi_basedir"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC" CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
_ACEOF _ACEOF

5
libada/configure.ac
View File

@ -16,6 +16,7 @@
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
sinclude(../config/acx.m4) sinclude(../config/acx.m4)
sinclude(../config/multi.m4)
sinclude(../config/override.m4) sinclude(../config/override.m4)
AC_INIT AC_INIT
@ -27,6 +28,7 @@ AC_CONFIG_SRCDIR([Makefile.in])
AC_CANONICAL_BUILD AC_CANONICAL_BUILD
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
target_alias=${target_alias-$host_alias}
# Determine the noncanonical target name, for directory use. # Determine the noncanonical target name, for directory use.
ACX_NONCANONICAL_TARGET ACX_NONCANONICAL_TARGET
@ -49,9 +51,6 @@ AC_ARG_ENABLE([maintainer-mode],
[MAINT='#']) [MAINT='#'])
AC_SUBST([MAINT])dnl AC_SUBST([MAINT])dnl
AC_CANONICAL_SYSTEM
target_alias=${target_alias-$host_alias}
AM_ENABLE_MULTILIB(, ..) AM_ENABLE_MULTILIB(, ..)
# Calculate toolexeclibdir # Calculate toolexeclibdir
# Also toolexecdir, though it's only used in toolexeclibdir # Also toolexecdir, though it's only used in toolexeclibdir