diff options
| author | Geoffrey Keating <geoffk@apple.com> | 2006-10-15 07:42:57 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2006-10-15 07:42:57 +0000 |
| commit | 5b043f084508752b8c5ae7659e01d6486455c166 (patch) | |
| tree | cf043af69064a496112900739079348012647f35 /config | |
| parent | 26d2906169b716076f9c58b9fc8fd47df4ad276f (diff) | |
| download | gcc-5b043f084508752b8c5ae7659e01d6486455c166.tar.gz | |
Index: config/ChangeLog
2006-10-14 Geoffrey Keating <geoffk@apple.com>
* multi.m4: New file, from automake version 2 branch.
Index: libgomp/ChangeLog
2006-10-14 Geoffrey Keating <geoffk@apple.com>
* aclocal.m4: Regenerate.
* configure: Regenerate.
Index: libstdc++-v3/ChangeLog
2006-10-14 Geoffrey Keating <geoffk@apple.com>
* aclocal.m4: Regenerate.
* configure: Regenerate with released autoconf-2.59.
Index: libobjc/ChangeLog
2006-10-14 Geoffrey Keating <geoffk@apple.com>
* 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 <geoffk@apple.com>
* aclocal.m4: Regenerate.
* configure: Regenerate.
From-SVN: r117741
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 4 | ||||
| -rw-r--r-- | config/multi.m4 | 65 |
2 files changed, 69 insertions, 0 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index fa855c0afa2..f403e017b11 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2006-10-14 Geoffrey Keating <geoffk@apple.com> + + * multi.m4: New file, from automake version 2 branch. + 2006-09-18 Tom Tromey <tromey@redhat.com> * tls.m4 (GCC_CHECK_TLS): Pass empty argument as "help arg" to diff --git a/config/multi.m4 b/config/multi.m4 new file mode 100644 index 00000000000..98417679f51 --- /dev/null +++ b/config/multi.m4 @@ -0,0 +1,65 @@ +## -*- Autoconf -*- +# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 +# 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 6 + +# 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) + +# 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_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 |