* 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.

diff --git a/ChangeLog b/ChangeLog
index a12a868714e270d3954df9166f8b35eb3c11179c..de63a1373d1276e267356f8e3d025707e0b1f5ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-01-06  Akim Demaille  <akim@epita.fr>
+
+       * 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.
+
+       
 2002-01-06  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Move the AC_SUBST

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 36e43902fa11d94ad52d306075d7fb67b06b8456..f33a1e51926535481cf1733497dab780c8d89df4 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -11573,11 +11573,11 @@ subfile-n.at ->'                       >-- autom4te* -->testsuite
 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

diff --git a/lib/autoconf/autotest.m4 b/lib/autoconf/autotest.m4
index 9b3aee008c23837b7f5f8c13fe609142d5171a47..e8c77e1f4e1b6daf39bc8b98f6e09b113bb6ebe7 100644 (file)
--- a/lib/autoconf/autotest.m4
+++ b/lib/autoconf/autotest.m4
@@ -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
-@%:@ Signature of the current package.
-m4@&t@_define([PACKAGE_NAME],      [$PACKAGE_NAME])
-m4@&t@_define([PACKAGE_TARNAME],   [$PACKAGE_TARNAME])
-m4@&t@_define([PACKAGE_VERSION],   [$PACKAGE_VERSION])
-m4@&t@_define([PACKAGE_STRING],    [$PACKAGE_STRING])
-m4@&t@_define([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].

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9012daad021cd686aec37ebe37c987dfdae50920..b384a8ee52fb22fa01afaa842da9ed14216431b8 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -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],      [@PACKAGE_NAME@])'; \
+         echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+         echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+         echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+         echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+       } >$(srcdir)/package.m4
+
+
+
+## ------------ ##
+## Test suite.  ##
+## ------------ ##
+
 TESTSUITE_GENERATED_AT = \
        aclang.at acc.at acfortran.at \
        acgeneral.at acstatus.at \
@@ -54,7 +74,7 @@ $(TESTSUITE): $(top_srcdir)/lib/m4sugar/m4sugar.m4 \
           $(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 $@.tmp

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c9ee5a13d30ca1ebe31f87526bedcb7465f4b73c..719e8eb91737f30c6b0d32e2ae59ee2663b9d473 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.5a from Makefile.am.
+# Makefile.in generated by automake 1.5c from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
@@ -13,10 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-# We don't actually distribute the testsuite, since one only
-# needs m4 to build it, m4 being required anyway to install Autoconf.
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -51,6 +47,7 @@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -72,8 +69,10 @@ PACKAGE_NAME = @PACKAGE_NAME@
 PERL = @PERL@
 VERSION = @VERSION@
 
+# 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.
@@ -163,7 +162,6 @@ uninstall-info-am:
 tags: TAGS
 TAGS:
 
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
@@ -171,7 +169,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
-         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
            $(mkinstalldirs) "$(distdir)/$$dir"; \
@@ -203,6 +201,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -263,11 +262,21 @@ uninstall-am: uninstall-info-am
        maintainer-clean-generic mostlyclean mostlyclean-generic \
        uninstall uninstall-am uninstall-info-am
 
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+       {                                       \
+         echo '# Signature of the current package.'; \
+         echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+         echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+         echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+         echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+         echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+       } >$(srcdir)/package.m4
 $(TESTSUITE): $(top_srcdir)/lib/m4sugar/m4sugar.m4 \
           $(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 $@.tmp