* m4/init.m4: Suggest fixing the call to AC_INIT when

AC_PACKAGE_NAME or AC_PACKAGE_VERSION is undefined.  This is for
newcomers who call AC_INIT and AM_INIT_AUTOMAKE without arguments.
* tests/init.test: New file.
* tests/Makefile.am (TESTS): Add it.

diff --git a/ChangeLog b/ChangeLog
index db9ca3a01f6d0a9f6f6ace71bb341e67b071354a..6ef5549f43c61107276daf406bf9973c43ace5e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-04  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * m4/init.m4: Suggest fixing the call to AC_INIT when
+       AC_PACKAGE_NAME or AC_PACKAGE_VERSION is undefined.  This is for
+       newcomers who call AC_INIT and AM_INIT_AUTOMAKE without arguments.
+       * tests/init.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+
 2006-08-04  Stepan Kasal  <kasal@ucw.cz>
 
        * automake.in (dist_dirs, fill_dist_dirs): Remove.

diff --git a/Makefile.in b/Makefile.in
index d4e4d913aefcf7528074563cc37d299624a6c05b..b5817fb665ae23c8810fa5be7d9a38f9d6251e5e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -386,7 +386,6 @@ distclean-tags:
 distdir: $(DISTFILES)
        $(am__remove_distdir)
        test -d $(distdir) || mkdir $(distdir)
-       $(mkdir_p) $(distdir)/m4 $(distdir)/tests
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        list='$(DISTFILES)'; \

diff --git a/m4/Makefile.in b/m4/Makefile.in
index c6b1340fda73e121952b6055ac5f539e9772be11..a6dc9c5911591a3a210d417a59dcb186b011cb91 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -236,7 +236,6 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-       $(mkdir_p) $(distdir)/../m4
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        list='$(DISTFILES)'; \

diff --git a/m4/init.m4 b/m4/init.m4
index 34fa71681f8809aadf344b300a1ca17beac265df..f6653840297984e1eacbece1bef3ef6b147030ea 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -1,7 +1,7 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 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,
@@ -53,6 +53,9 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 92591380a1270abecac4128e14651c11eb948511..7ee9370f196bfdf9301ec6283bf1546e4a90462b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -270,6 +270,7 @@ implicit.test \
 include.test \
 include2.test \
 info.test \
+init.test \
 insh2.test \
 install2.test \
 installdir.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index bd43b5fdbdc3a4f66b81591de044edfbf6d809ff..b0bc5f4fd1ad266dfe1fd49ec876d7229c35041d 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -401,6 +401,7 @@ implicit.test \
 include.test \
 include2.test \
 info.test \
+init.test \
 insh2.test \
 install2.test \
 installdir.test \

diff --git a/tests/init.test b/tests/init.test
new file mode 100755 (executable)
index 0000000..76feca6
--- /dev/null
+++ b/tests/init.test
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (C) 2006  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., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+# Make sure we give a sensible error message when neither AC_INIT nor
+# AM_INIT_AUTOMAKE are given arguments.
+
+. ./defs || exit 1
+
+set -e
+
+cat >configure.in <<END
+AC_INIT
+AM_INIT_AUTOMAKE
+END
+
+# The error message should mension AC_INIT, not AC_PACKAGE_VERSION.
+($ACLOCAL && $AUTOCONF) 2>stderr && exit 1
+cat stderr
+grep AC_PACKAGE_VERSION stderr && exit 1
+grep AC_INIT stderr