* m4/amversion.in (AM_AUTOMAKE_VERSION): Point users to

AM_INIT_AUTOMAKE if the version passed is incorrect.
* tests/version8.test: New file.
* tests/Makefile.am (TESTS): Add version8.test.

diff --git a/ChangeLog b/ChangeLog
index 228f1dd2c265ee522bdc0cf5d11b786394335130..3332d24537c30e54e85874a1359fd3728a5fda04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-13  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * m4/amversion.in (AM_AUTOMAKE_VERSION): Point users to
+       AM_INIT_AUTOMAKE if the version passed is incorrect.
+       * tests/version8.test: New file.
+       * tests/Makefile.am (TESTS): Add version8.test.
+
 2005-01-09  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * m4/amversion.in, m4/as.m4, m4/auxdir.m4, m4/ccstdc.m4,

diff --git a/m4/amversion.in b/m4/amversion.in
index 23bc00cffe670d38cc66178fc93e36bfb1f07909..155c80ba7538474f3dd647bddd2fdac69171a456 100644 (file)
--- a/m4/amversion.in
+++ b/m4/amversion.in
@@ -10,7 +10,14 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="@APIVERSION@"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='@APIVERSION@'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [@VERSION@], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------

diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 5358e50a9b8ffcaa4ad8ba7da8a2ecabdb2d6d4c..c70d5ea2a2288c2f95b3361e6a40c7c998d4359a 100644 (file)
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -10,7 +10,14 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9a"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.9a'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.9a], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2f138273cc37ba4bbebdbc82f424300984c09bf8..5f3727e354e04f09ce84f817a4c417975b245fb7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -547,6 +547,7 @@ version3.test \
 version4.test \
 version6.test \
 version7.test \
+version8.test \
 vpath.test \
 vtexi.test \
 vtexi2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index ed4c3cf8b9c150d600aeefb3154155e840a91a0c..06255b72e37aa87af33969597958d592df0990bd 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -667,6 +667,7 @@ version3.test \
 version4.test \
 version6.test \
 version7.test \
+version8.test \
 vpath.test \
 vtexi.test \
 vtexi2.test \

diff --git a/tests/version8.test b/tests/version8.test
new file mode 100755 (executable)
index 0000000..ee07ac4
--- /dev/null
+++ b/tests/version8.test
@@ -0,0 +1,28 @@
+#! /bin/sh
+# Copyright (C) 2005  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Calling AM_AUTOMAKE_VERSION by hand is a bug.
+
+. ./defs || exit 1
+
+set -e
+echo 'AM_AUTOMAKE_VERSION([1.9])' >>configure.in
+$ACLOCAL 2>stderr && exit 0
+$FGREP 'AM_INIT_AUTOMAKE([1.9])' stderr