From ff4344250921a499b827eae88e7353069da0420b Mon Sep 17 00:00:00 2001 From: geoffk Date: Sun, 15 Oct 2006 07:42:57 +0000 Subject: Index: config/ChangeLog 2006-10-14 Geoffrey Keating * multi.m4: New file, from automake version 2 branch. Index: libgomp/ChangeLog 2006-10-14 Geoffrey Keating * aclocal.m4: Regenerate. * configure: Regenerate. Index: libstdc++-v3/ChangeLog 2006-10-14 Geoffrey Keating * aclocal.m4: Regenerate. * configure: Regenerate with released autoconf-2.59. Index: libobjc/ChangeLog 2006-10-14 Geoffrey Keating * Makefile.in: Use multi_basedir instead of toplevel_srcdir. * configure.ac: Use multi.m4 from aclocal rather than custom code. Use multi_basedir instead of toplevel_srcdir. * aclocal.m4: Regenerate. * configure: Regenerate. Index: libssp/ChangeLog 2006-10-14 Geoffrey Keating * aclocal.m4: Regenerate. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117741 138bc75d-0d04-0410-961f-82ee72b054a4 --- libssp/ChangeLog | 5 +++++ libssp/aclocal.m4 | 63 +++---------------------------------------------------- libssp/configure | 9 +++++++- 3 files changed, 16 insertions(+), 61 deletions(-) (limited to 'libssp') diff --git a/libssp/ChangeLog b/libssp/ChangeLog index 60d9a19d831..213f763defe 100644 --- a/libssp/ChangeLog +++ b/libssp/ChangeLog @@ -1,3 +1,8 @@ +2006-10-14 Geoffrey Keating + + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2006-09-29 Joseph S. Myers PR other/25035 diff --git a/libssp/aclocal.m4 b/libssp/aclocal.m4 index 7777acfc6d7..bd4d78caf70 100644 --- a/libssp/aclocal.m4 +++ b/libssp/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -647,64 +647,6 @@ else fi AC_SUBST([mkdir_p])]) -# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR]) -# --------------------------------------------------- -# Add --enable-multilib to configure. -AC_DEFUN([AM_ENABLE_MULTILIB], -[# Default to --enable-multilib -AC_ARG_ENABLE(multilib, -[ --enable-multilib build many library versions (default)], -[case "$enableval" in - yes) multilib=yes ;; - no) multilib=no ;; - *) AC_MSG_ERROR([bad value $enableval for multilib option]) ;; - esac], - [multilib=yes]) - -# We may get other options which we leave undocumented: -# --with-target-subdir, --with-multisrctop, --with-multisubdir -# See config-ml.in if you want the gory details. - -if test "$srcdir" = "."; then - if test "$with_target_subdir" != "."; then - multi_basedir="$srcdir/$with_multisrctop../$2" - else - multi_basedir="$srcdir/$with_multisrctop$2" - fi -else - multi_basedir="$srcdir/$2" -fi -AC_SUBST(multi_basedir) - -AC_OUTPUT_COMMANDS([ -# Only add multilib support code if we just rebuilt the top-level -# Makefile. -case " $CONFIG_FILES " in - *" ]m4_default([$1],Makefile)[ "*) - ac_file=]m4_default([$1],Makefile)[ . ${multi_basedir}/config-ml.in - ;; -esac], - [ -srcdir="$srcdir" -host="$host" -target="$target" -with_multisubdir="$with_multisubdir" -with_multisrctop="$with_multisrctop" -with_target_subdir="$with_target_subdir" -ac_configure_args="${multilib_arg} ${ac_configure_args}" -multi_basedir="$multi_basedir" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -CC="$CC"])])dnl - # Helper functions for option handling. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. @@ -917,5 +859,6 @@ AC_SUBST([am__untar]) m4_include([../config/acx.m4]) m4_include([../config/depstand.m4]) m4_include([../config/lead-dot.m4]) +m4_include([../config/multi.m4]) m4_include([../config/no-executables.m4]) m4_include([../libtool.m4]) diff --git a/libssp/configure b/libssp/configure index dbb7abbd3c1..38f5b3ca356 100755 --- a/libssp/configure +++ b/libssp/configure @@ -1928,6 +1928,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" @@ -4929,7 +4936,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4932 "configure"' > conftest.$ac_ext + echo '#line 4939 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? -- cgit v1.2.1