From b81d1bfec14ca9d52d8225734053c80833eed2f5 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 4 Aug 2006 14:53:32 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ Makefile.in | 1 - m4/Makefile.in | 1 - m4/init.m4 | 7 +++++-- tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/init.test | 37 +++++++++++++++++++++++++++++++++++++ 7 files changed, 52 insertions(+), 4 deletions(-) create mode 100755 tests/init.test diff --git a/ChangeLog b/ChangeLog index db9ca3a0..6ef5549f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-08-04 Alexandre Duret-Lutz + + * 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 * automake.in (dist_dirs, fill_dist_dirs): Remove. diff --git a/Makefile.in b/Makefile.in index d4e4d913..b5817fb6 100644 --- 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 c6b1340f..a6dc9c59 100644 --- 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 34fa7168..f6653840 100644 --- 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 92591380..7ee9370f 100644 --- 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 bd43b5fd..b0bc5f4f 100644 --- 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 index 00000000..76feca6a --- /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 <stderr && exit 1 +cat stderr +grep AC_PACKAGE_VERSION stderr && exit 1 +grep AC_INIT stderr -- 2.43.5