diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-08 12:49:36 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-08 12:49:36 +0200 |
| commit | 12405c9fccb92791116c0391cbd7669ea00e9a04 (patch) | |
| tree | e7cee329d35fc7a559c6615a5b51a4d26888a7a4 /m4/init.m4 | |
| parent | adb834ebf078a00ed67ebc325c692452e6e5dcf6 (diff) | |
| parent | 33c59ec5252efb1021b2e52a8cad40918670362b (diff) | |
| download | automake-12405c9fccb92791116c0391cbd7669ea00e9a04.tar.gz | |
Merge branch 'maint'
* maint:
tests: fix a spurious failure with dash
test defs: fix indentation (cosmetic change)
tests: remove obsolete uses of $sh_errexit_works
configure: search a sturdy POSIX shell to be used in the testsuite
tests: shell running test scripts is now named AM_TEST_RUNNER_SHELL
fixup: distribute t/README
init: warn against obsolete usage of AM_INIT_AUTOMAKE
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'm4/init.m4')
| -rw-r--r-- | m4/init.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/m4/init.m4 b/m4/init.m4 index a496154d0..0a6eefc4c 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -52,7 +52,10 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], +[$0: two- and three-arguments forms are deprecated. For more info, see: +http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl |