diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-21 20:52:43 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-21 20:52:43 +0100 |
| commit | e5ae760b9d7d79839a81d847433d44d5cdb2fef7 (patch) | |
| tree | c29de617b8aad80bcbe3ac6260e380a4a2959b03 /m4 | |
| parent | 3a7b60b1ca8a2f2b86acf494d649bff66beb445b (diff) | |
| parent | 91158d7245f194f7fc40d8da8965c59965112601 (diff) | |
| download | automake-e5ae760b9d7d79839a81d847433d44d5cdb2fef7.tar.gz | |
Merge branch 'maint'
* maint:
fixup: distribute 'contrib/multilib/multi.m4'
multilib: deprecate, will be moved to contrib
fixlet: flags for Fortran77 compiler are in FFLAGS, not F77FLAGS
cosmetics: fix a botched comment in a maintainer check
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/multi.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/m4/multi.m4 b/m4/multi.m4 index bc01dcf7b..bbb964fac 100644 --- a/m4/multi.m4 +++ b/m4/multi.m4 @@ -1,6 +1,6 @@ ## -*- Autoconf -*- -# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2011 -# Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2011, +# 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,6 +12,9 @@ # --------------------------------------------------- # Add --enable-multilib to configure. AC_DEFUN([AM_ENABLE_MULTILIB], +[m4_warn([obsolete], [$0 will be removed from Automake core soon. +Files implementing the "multilib" feature are (and will remain) available +to the 'contrib/' directory in the Automake distribution.])]dnl [# Default to --enable-multilib AC_ARG_ENABLE([multilib], [AS_HELP_STRING( |