03-fyi-package-m4.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * lib/autoconf/autotest.m4 (AC_CONFIG_TESTDIR): Don't create
        package.m4, since is really depends upon configure.ac, not
        configure.
        * doc/autoconf.texi (testsuite Scripts): Adjust.
        * tests/Makefile.am (package.m4): New.
        EXTRA_DIST it since its a source.
        
        
Index: doc/autoconf.texi
--- doc/autoconf.texi Sat, 05 Jan 2002 15:20:22 +0100 akim
+++ doc/autoconf.texi Sat, 05 Jan 2002 15:38:48 +0100 akim
@@ -11573,11 +11573,11 @@ subfile-n.at ->'                       >
 Files used in configuring a software package:
 
 @example
-                                     .-> package.m4
+                                     .--> atconfig
                                     /
-[atlocal.in] -->  config.status* --<---> atconfig
+[atlocal.in] -->  config.status* --<
                                     \
-                                     `-> [atlocal]
+                                     `--> [atlocal]
 @end example
 
 @noindent
Index: lib/autoconf/autotest.m4
--- lib/autoconf/autotest.m4 Fri, 04 Jan 2002 17:28:33 +0100 akim
+++ lib/autoconf/autotest.m4 Sat, 05 Jan 2002 15:44:21 +0100 akim
@@ -1,6 +1,6 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Interface with Autotest.
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -62,24 +62,7 @@
 # Do not use _ACEOF as we are being dumped into config.status via
 # an _ACEOF-heredoc.
 AC_DEFUN([AC_CONFIG_TESTDIR],
-[AC_CONFIG_COMMANDS([$1/package.m4],
-[[cat >$1/package.m4 <<ATEOF
address@hidden:@ Signature of the current package.
-m4@&address@hidden([PACKAGE_NAME],      [$PACKAGE_NAME])
-m4@&address@hidden([PACKAGE_TARNAME],   [$PACKAGE_TARNAME])
-m4@&address@hidden([PACKAGE_VERSION],   [$PACKAGE_VERSION])
-m4@&address@hidden([PACKAGE_STRING],    [$PACKAGE_STRING])
-m4@&address@hidden([PACKAGE_BUGREPORT], [$PACKAGE_BUGREPORT])
-ATEOF
-]],
-[[PACKAGE_NAME='$PACKAGE_NAME'
-PACKAGE_TARNAME='$PACKAGE_TARNAME'
-PACKAGE_VERSION='$PACKAGE_VERSION'
-PACKAGE_STRING='$PACKAGE_STRING'
-PACKAGE_BUGREPORT='$PACKAGE_BUGREPORT'
-]])
-
-AC_CONFIG_COMMANDS([$1/atconfig],
+[AC_CONFIG_COMMANDS([$1/atconfig],
 [cat >$1/atconfig <<ATEOF
 @%:@ Configurable variable values for building test suites.
 @%:@ Generated by $[0].
Index: tests/Makefile.am
--- tests/Makefile.am Wed, 14 Nov 2001 20:54:00 +0100 akim
+++ tests/Makefile.am Sat, 05 Jan 2002 15:31:08 +0100 akim
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in. -*-Makefile-*-
 
 ## Makefile for Autoconf testsuite.
-## Copyright 2000, 2001 Free Software Foundation, Inc.
+## Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,13 +21,33 @@
 # We don't actually distribute the testsuite, since one only
 # needs m4 to build it, m4 being required anyway to install Autoconf.
 EXTRA_DIST = $(TESTSUITE_AT) atspecific.m4 mktests.sh \
-             atlocal.in
+             atlocal.in package.m4
 
 # Running the uninstalled scripts.
 WRAPPERS = autoconf autoheader autoreconf autom4te autoscan autoupdate ifnames
 
 DISTCLEANFILES = atconfig atlocal package.m4 $(TESTSUITE) $(WRAPPERS)
 
+## ------------ ##
+## package.m4.  ##
+## ------------ ##
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+       {                                       \
+         echo '# Signature of the current package.'; \
+         echo 'm4_define([AT_PACKAGE_NAME],      address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_TARNAME],   address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_VERSION],   address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_STRING],    address@hidden@])'; \
+         echo 'm4_define([AT_PACKAGE_BUGREPORT], address@hidden@])'; \
+       } >$(srcdir)/package.m4
+
+
+
+## ------------ ##
+## Test suite.  ##
+## ------------ ##
+
 TESTSUITE_GENERATED_AT = \
        aclang.at acc.at acfortran.at \
        acgeneral.at acstatus.at \
@@ -54,7 +74,7 @@
           $(top_srcdir)/lib/m4sugar/m4sh.m4 \
            $(top_srcdir)/lib/autotest/autotest.m4 \
            $(top_srcdir)/lib/autotest/general.m4 \
-          package.m4 \
+          $(srcdir)/package.m4 \
           atspecific.m4 \
            $(TESTSUITE_AT)
        $(AUTOTEST) -I $(srcdir) suite.at -o address@hidden