AM_INIT_AUTOMAKE if the version passed is incorrect.
* tests/version8.test: New file.
* tests/Makefile.am (TESTS): Add version8.test.
+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,
# ----------------------------
# 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
# -------------------------------
# ----------------------------
# 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
# -------------------------------
version4.test \
version6.test \
version7.test \
+version8.test \
vpath.test \
vtexi.test \
vtexi2.test \
version4.test \
version6.test \
version7.test \
+version8.test \
vpath.test \
vtexi.test \
vtexi2.test \
--- /dev/null
+#! /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