From ca78ee6f315dab1fcb1c361a6512fc90f0de32cf Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 14 Oct 2006 13:27:34 +0000 Subject: [PATCH] * m4/multi.m4: Non-default multilibs may be cross compilation. --- ChangeLog | 8 ++++++-- THANKS | 2 ++ m4/multi.m4 | 11 +++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c70d4cae..94f55e05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-10-14 Geoffrey Keating (tiny change) + + * m4/multi.m4: Non-default multilibs may be cross compilation. + 2006-10-14 Ralf Wildenhues * automake.in: Fix some typos in comments. @@ -7,10 +11,10 @@ * automake.in (handle_compile): Use subst, for maintainer-check. -2006-10-09 andi5.py@gmx.net (tiny change) +2006-10-09 Andreas Köhler (tiny change) For PR automake/505: - * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES): + * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES): Fix typo: `config.status.lineno', not `configure.status.lineno'. 2006-09-05 Ralf Wildenhues diff --git a/THANKS b/THANKS index c1343224..68018e35 100644 --- a/THANKS +++ b/THANKS @@ -13,6 +13,7 @@ Alexander Turbov zaufi@sendmail.ru Alexandre Duret-Lutz duret_g@epita.fr Alexey Mahotkin alexm@hsys.msk.ru Andreas Buening andreas.buening@nexgo.de +Andreas Köhler andi5.py@gmx.net Andreas Schwab schwab@suse.de Andrew Cagney cagney@tpgi.com.au Andrew Suffield asuffield@debian.org @@ -85,6 +86,7 @@ Ganesan Rajagopal rganesan@novell.com Garrett D'Amore garrett@qualcomm.com Garth Corral garthc@inktomi.com Gary V Vaughan gvaughan@oranda.demon.co.uk +Geoffrey Keating geoffk@apple.com Glenn Amerine glenn@pie.mhsc.org Gord Matzigkeit gord@gnu.ai.mit.edu Gordon Sadler gbsadler1@lcisp.com diff --git a/m4/multi.m4 b/m4/multi.m4 index d20d266d..98417679 100644 --- a/m4/multi.m4 +++ b/m4/multi.m4 @@ -1,12 +1,12 @@ ## -*- Autoconf -*- -# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005 +# 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 5 +# serial 6 # AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR]) # --------------------------------------------------- @@ -37,6 +37,13 @@ else 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. -- 2.43.5