51-fyi-ac-config-testdir.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * m4/atconfig.m4 (AT_CONFIG): Remove, replaced by...
        * lib/autoconf/autotest.m4 (AC_CONFIG_TESTDIR): this.
        New file.
        * m4/Makefile.am (EXTRA_DIST): Oops, adjust...

Index: aclocal.m4
--- aclocal.m4 Fri, 24 Aug 2001 08:01:11 +0200 akim
+++ aclocal.m4 Fri, 24 Aug 2001 09:35:06 +0200 akim
@@ -1,4 +1,3 @@
-m4_include([m4/atconfig.m4])
 m4_include([m4/auxdir.m4])
 m4_include([m4/cond.m4])
 m4_include([m4/depend.m4])
Index: configure.ac
--- configure.ac Tue, 21 Aug 2001 07:55:37 +0200 akim
+++ configure.ac Fri, 24 Aug 2001 09:38:04 +0200 akim
@@ -19,14 +19,16 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.

-AC_PREREQ(2.50)
+# We need AC_CONFIG_TESTDIR.
+AC_PREREQ(2.52c)
+
 AC_INIT(GNU Autoconf, 2.52c, address@hidden)
 AC_CONFIG_SRCDIR(ChangeLog)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE(autoconf, 2.52c)

 # Initialize the test suite.
-AT_CONFIG(tests, ../bin)
+AC_CONFIG_TESTDIR(tests, ../bin)
 AC_PATH_PROG(EXPR, expr)

 # We use a path for GNU m4 so even if users have another m4 first in
Index: lib/autoconf/Makefile.am
--- lib/autoconf/Makefile.am Fri, 24 Aug 2001 09:22:50 +0200 akim
+++ lib/autoconf/Makefile.am Fri, 24 Aug 2001 09:37:08 +0200 akim
@@ -21,7 +21,7 @@
 dist_autoconflib_DATA = \
        autoconf.m4 \
         general.m4 status.m4 oldnames.m4 specific.m4 \
-       autoheader.m4 autoupdate.m4 \
+       autoheader.m4 autoupdate.m4 autotest.m4 \
        lang.m4 c.m4 fortran.m4 \
         functions.m4 headers.m4 types.m4 libs.m4 programs.m4

@@ -114,6 +114,7 @@ autoconf.m4f: $(srclibdir)/m4sugar/m4sug
               $(srclibdir)/autoconf/general.m4 \
               $(srclibdir)/autoconf/autoheader.m4 \
               $(srclibdir)/autoconf/autoupdate.m4 \
+              $(srclibdir)/autoconf/autotest.m4 \
               $(srclibdir)/autoconf/status.m4  \
               $(srclibdir)/autoconf/oldnames.m4        \
               $(srclibdir)/autoconf/specific.m4        \
Index: lib/autoconf/autoconf.m4
--- lib/autoconf/autoconf.m4 Fri, 24 Aug 2001 09:22:50 +0200 akim
+++ lib/autoconf/autoconf.m4 Fri, 24 Aug 2001 09:36:52 +0200 akim
@@ -60,6 +60,7 @@
 m4_include([autoconf/general.m4])
 m4_include([autoconf/status.m4])
 m4_include([autoconf/autoheader.m4])
+m4_include([autoconf/autotest.m4])
 m4_include([autoconf/programs.m4])
 m4_include([autoconf/lang.m4])
 m4_include([autoconf/c.m4])
Index: lib/autoconf/status.m4
--- lib/autoconf/status.m4 Fri, 24 Aug 2001 08:55:57 +0200 akim
+++ lib/autoconf/status.m4 Fri, 24 Aug 2001 09:34:08 +0200 akim
@@ -129,7 +129,7 @@
 # Ouputs:
 # - `ac_dots' is `build -> top_build'.  If not empty, has a trailing slash.
 # - `ac_srcdir' is `build -> src'.
-# - `ac_top_srcdir' is `build -> top-srcdir'
+# - `ac_top_srcdir' is `build -> top-src'
 m4_define([_AC_SRCPATHS],
 [if test $1 != .; then
   ac_dir_suffix=/`echo $1 | sed 's,^\./,,'`
@@ -346,6 +346,8 @@ m4_define([_AC_OUTPUT_COMMANDS],
 for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
   ac_source=`echo "$ac_file" | sed 's,[[^:]]*:,,'`
+  ac_dir=`AS_DIRNAME(["$ac_dest"])`
+  _AC_SRCPATHS(["$ac_dir"])

   AC_MSG_NOTICE([executing $ac_dest commands])
   case $ac_dest in
Index: lib/autotest/general.m4
--- lib/autotest/general.m4 Thu, 23 Aug 2001 21:34:53 +0200 akim
+++ lib/autotest/general.m4 Fri, 24 Aug 2001 09:34:20 +0200 akim
@@ -94,14 +94,6 @@ m4_define([AT_data_files], [stdout expou

 . ./atconfig

-# Path to the top builddir: reverse at_testdir
-top_builddir=`echo '$at_testdir' |
-                sed 's,^\./,,;s,[[^/]]$,&/,;s,[[^/]]*/,../,g;s,/$,,'`
-# Path to the top srcdir: to go to top build, then to top src
-top_srcdir=$top_builddir/$at_topbuild_2_topsrc
-# Path to srcdir: from top srcdir to this dir.
-srcdir=$top_srcdir/$at_testdir
-
 # Use absolute file notations, as the test might change directories.
 at_srcdir=`cd "$srcdir" && pwd`
 at_top_srcdir=`cd "$top_srcdir" && pwd`
Index: m4/Makefile.am
--- m4/Makefile.am Mon, 04 Jun 2001 18:29:01 +0200 akim
+++ m4/Makefile.am Fri, 24 Aug 2001 09:35:45 +0200 akim
@@ -18,9 +18,13 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.

-EXTRA_DIST = \
-atconfig.m4 \
-init.m4 \
-m4.m4 \
-missing.m4 \
-sanity.m4
+EXTRA_DIST =                                   \
+auxdir.m4                                      \
+cond.m4                                                \
+depend.m4                                      \
+init.m4                                                \
+install-sh.m4                                  \
+m4.m4                                          \
+missing.m4                                     \
+sanity.m4                                      \
+strip.m4
Index: lib/autoconf/autotest.m4
--- 0.715/lib/autoconf/autotest.m4 Fri, 24 Aug 2001 09:52:50 +0200 akim ()
+++ lib/autoconf/autotest.m4 Fri, 24 Aug 2001 09:52:18 +0200 akim
@@ -0,0 +1,101 @@
+# This file is part of Autoconf.                       -*- Autoconf -*-
+# Interface with Autotest.
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception, the Free Software Foundation gives unlimited
+# permission to copy, distribute and modify the configure scripts that
+# are the output of Autoconf.  You need not follow the terms of the GNU
+# General Public License when using or distributing such scripts, even
+# though portions of the text of Autoconf appear in them.  The GNU
+# General Public License (GPL) does govern all other use of the material
+# that constitutes the Autoconf program.
+#
+# Certain portions of the Autoconf source text are designed to be copied
+# (in certain cases, depending on the input) into the output of
+# Autoconf.  We call these the "data" portions.  The rest of the Autoconf
+# source text consists of comments plus executable code that decides which
+# of the data portions to output in any given case.  We call these
+# comments and executable code the "non-data" portions.  Autoconf never
+# copies any of the non-data portions into its output.
+#
+# This special exception to the GPL applies to versions of Autoconf
+# released by the Free Software Foundation.  When you make and
+# distribute a modified version of Autoconf, you may extend this special
+# exception to the GPL to apply to your modified version as well, *unless*
+# your modified version has the potential to copy into its output some
+# of the text that was the non-data portion of the version that you started
+# with.  (In other words, unless your change moves or copies text from
+# the non-data portions to the data portions.)  If your modification has
+# such potential, you must delete any notice of this special exception
+# to the GPL from your modified version.
+#
+# Written by David MacKenzie, with help from
+# Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor,
+# Roland McGrath, Noah Friedman, david d zuhn, and many others.
+
+
+# AC_CONFIG_TESTDIR(TEST-DIRECTORY, [AUTOTEST-PATH = .])
+# ------------------------------------------------------
+# Configure an Autotest test suite directory.  Invoke it once per dir,
+# even if there are several test suites in there.
+#
+# AUTOTEST-PATH must help the test suite to find the executables,
+# i.e., if the executables are in `src/', pass `src'.  If there are
+# also executables in the source tree, use `src:$top_srcdir/src'.
+AC_DEFUN([AC_CONFIG_TESTDIR],
+[AC_CONFIG_COMMANDS([$1/atconfig],
+[cat >$1/atconfig <<ATEOF
address@hidden:@ Configurable variable values for building test suites.
address@hidden:@ Generated by $[0]
address@hidden:@ Copyright 2000, 2001 Free Software Foundation, Inc.
+
+at_package='$at_package'
+at_version='$at_version'
+at_bugreport='$at_bugreport'
+
+at_n='$at_n'
+at_c='$at_c'
+
+at_testdir='$1'
+srcdir='$ac_srcdir'
+top_srcdir='$ac_top_srcdir'
+top_builddir='$ac_dots'
+
+AUTOTEST_PATH='m4_default([$2], [.])'
+
+SHELL=\${CONFIG_SHELL-'$at_shell'}
+PATH_SEPARATOR='$at_path_separator'
+
+ATEOF
+],
+[at_package='$PACKAGE_NAME'
+at_version='$PACKAGE_VERSION'
+at_bugreport='$PACKAGE_BUGREPORT'
+
+at_n='$ECHO_N'
+at_c='$ECHO_C'
+
+at_shell='$SHELL'
+at_path_separator='$PATH_SEPARATOR'
+])
+
+if test -f $srcdir/$1/atlocal.in; then
+  AC_CONFIG_FILES([$1/atlocal])
+fi
+])# AC_CONFIG_TESTDIR
Index: m4/atconfig.m4
--- m4/atconfig.m4 Tue, 21 Aug 2001 07:55:37 +0200 akim
+++ 0.715(w)/m4/atconfig.m4 Fri, 24 Aug 2001 09:52:50 +0200 akim ()
@@ -1,74 +0,0 @@
-## ----------------------##                              -*- Autoconf -*-
-## Prepare for testing.  ##
-## ----------------------##
-
-#serial 6
-
-# Copyright 2000, 2001 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-
-# AT_CONFIG(TEST-DIRECTORY, [AUTOTEST-PATH = .])
-# ----------------------------------------------
-# Configure the test suite.
-#
-# AUTOTEST-PATH must help the test suite to find the executables,
-# i.e., if the executables are in `src/', pass `src'.  If there are
-# also executables in the source tree, use `src:$top_srcdir/src'.
-
-AC_DEFUN([AT_CONFIG],
-[AC_CONFIG_COMMANDS([$1/atconfig],
-[cat >$1/atconfig <<ATEOF
address@hidden:@ Configurable variable values for building test suites.
address@hidden:@ Generated by $[0]
address@hidden:@ Copyright 2000, 2001 Free Software Foundation, Inc.
-
-at_package='$at_package'
-at_version='$at_version'
-at_bugreport='$at_bugreport'
-
-at_n='$at_n'
-at_c='$at_c'
-
-at_testdir='$1'
-at_topbuild_2_topsrc='$at_topbuild_2_topsrc'
-
-AUTOTEST_PATH='m4_default([$2], [.])'
-
-SHELL=\${CONFIG_SHELL-'$at_shell'}
-PATH_SEPARATOR='$at_path_separator'
-
-ATEOF
-],
-[at_package='$PACKAGE_NAME'
-at_version='$PACKAGE_VERSION'
-at_bugreport='$PACKAGE_BUGREPORT'
-
-at_n='$ECHO_N'
-at_c='$ECHO_C'
-
-# Path from top_build to top_src
-at_topbuild_2_topsrc=$srcdir
-
-at_shell='$SHELL'
-at_path_separator='$PATH_SEPARATOR'
-])
-
-if test -f $srcdir/$1/atlocal.in; then
-  AC_CONFIG_FILES([$1/atlocal])
-fi
-])# AT_CONFIG