[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] Tests init: default definition of AC_CONFIG_AUX_DIR
|
From: |
Stefano Lattarini |
|
Subject: |
[PATCH 1/2] Tests init: default definition of AC_CONFIG_AUX_DIR |
|
Date: |
Sat, 8 May 2010 00:57:21 +0200 |
|
User-agent: |
KMail/1.12.1 (Linux/2.6.30-2-686; KDE/4.3.4; i686; ; ) |
Hello automakers.
I see that some tests explicitly put a call like:
AC_CONFIG_AUX_DIR([.])
in the generated configure.in, to prevent automake from looking into ..
and ../.. when trying to copy required files.
I think that such a provision should be made unconditional, as it
could help to reduce undefined/unexpected behaviours. Obviously, we
should leave the user a way to easily override the default, if he
wants to -- this is required by some tests anyway.
The first patch in this series implements this idea. The second one
extends the tests on `AC_CONFIG_AUX_DIR' itself.
Regards,
Stefano
-*-*-
Tests initialization: put default definition of AC_CONFIG_AUX_DIR
in the pre-populated configure.in.
* tests/defs.in: Put default definition of AC_CONFIG_AUX_DIR
in the pre-populated configure.in, through the (overridable)
shell variable `$config_auxdir'.
* tests/auxdir.test: Updated accordingly.
* tests/auxdir2.test: Likewise.
* tests/auxdir3.test: Likewise.
* tests/auxdir4.test: Likewise.
* tests/mdate3.test: Likewise.
* tests/parallel-am.test: Likewise.
* tests/parallel-am3.test: Likewise.
* tests/reqd.test: Likewise.
* tests/reqd2.test: Likewise.
* tests/symlink.test: Likewise.
* tests/txinfo22.test: Likewise.
* tests/install2.test: Likewise. Also, converted the generated
configure.in to a more modern style.
* tests/pr224.test: Likewise.
* tests/pr9.test: Likewise.
* tests/subdir4.test: Likewise.
* tests/subobj3.test: Likewise.
* tests/subobj8.test: Likewise.
* tests/txinfo8.test: Likewise.
* tests/depdist.test: Likewise. Also, call `set -e' earlier.
* tests/vtexi.test: Likewise.
* tests/acloca17: Updated configure.in's line number in grepping
of aclocal's error messages.
* tests/txinfo29.test: Likewise.
* tests/copy.test: Made slighty stricter.
* tests/subdir.test: Adapted and extended.
-*-*-
Note that I didn't update the tests `lex3.test', `lex5.test',
`multilib.test,' `yacc4.test', `yacc6.test', `yacc8.test' and
`yaccvpath.test', as they will be the objects of future patches.
-*-*-
From 0062e7121a1d83a3b938dddc49377430468d8584 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Fri, 7 May 2010 23:36:29 +0200
Subject: [PATCH 1/2] Tests init: default definition of AC_CONFIG_AUX_DIR
* tests/defs.in: Put default definition of AC_CONFIG_AUX_DIR
in the pre-populated configure.in, through the (overridable)
shell variable `$config_auxdir'.
* tests/auxdir.test: Updated accordingly.
* tests/auxdir2.test: Likewise.
* tests/auxdir3.test: Likewise.
* tests/auxdir4.test: Likewise.
* tests/mdate3.test: Likewise.
* tests/parallel-am.test: Likewise.
* tests/parallel-am3.test: Likewise.
* tests/reqd.test: Likewise.
* tests/reqd2.test: Likewise.
* tests/symlink.test: Likewise.
* tests/txinfo22.test: Likewise.
* tests/install2.test: Likewise. Also, converted the generated
configure.in to a more modern style.
* tests/pr224.test: Likewise.
* tests/pr9.test: Likewise.
* tests/subdir4.test: Likewise.
* tests/subobj3.test: Likewise.
* tests/subobj8.test: Likewise.
* tests/txinfo8.test: Likewise.
* tests/depdist.test: Likewise. Also, call `set -e' earlier.
* tests/vtexi.test: Likewise.
* tests/acloca17: Updated configure.in's line number in grepping
of aclocal's error messages.
* tests/txinfo29.test: Likewise.
* tests/copy.test: Made slighty stricter.
* tests/subdir.test: Adapted and extended.
---
ChangeLog | 33 +++++++++++++++++++++++++++++++++
tests/acloca17.test | 4 ++--
tests/auxdir.test | 13 ++++---------
tests/auxdir2.test | 13 ++++---------
tests/auxdir3.test | 7 ++++---
tests/auxdir4.test | 10 ++--------
tests/copy.test | 9 +++++++--
tests/defs.in | 6 +++++-
tests/depdist.test | 17 +++++++----------
tests/install2.test | 12 +++++-------
tests/mdate3.test | 11 +++--------
tests/parallel-am.test | 9 +++------
tests/parallel-am3.test | 9 +++------
tests/pr224.test | 9 +++------
tests/pr9.test | 14 ++++++--------
tests/reqd.test | 3 ++-
tests/reqd2.test | 9 +++------
tests/subdir.test | 16 +++++++++++-----
tests/subdir4.test | 14 +++++++-------
tests/subobj3.test | 12 ++++--------
tests/subobj8.test | 11 +++++------
tests/symlink.test | 11 +++--------
tests/txinfo22.test | 10 ++++------
tests/txinfo29.test | 2 +-
tests/txinfo8.test | 14 ++++++--------
tests/vtexi.test | 7 ++++---
26 files changed, 141 insertions(+), 144 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 71b0d9b..c59ad57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2010-05-08 Stefano Lattarini <address@hidden>
+
+ Tests initialization: put default definition of AC_CONFIG_AUX_DIR
+ in the pre-populated configure.in.
+ * tests/defs.in: Do that, through the (overridable) shell variable
+ `$config_auxdir'.
+ * tests/auxdir.test: Updated accordingly.
+ * tests/auxdir2.test: Likewise.
+ * tests/auxdir3.test: Likewise.
+ * tests/auxdir4.test: Likewise.
+ * tests/mdate3.test: Likewise.
+ * tests/parallel-am.test: Likewise.
+ * tests/parallel-am3.test: Likewise.
+ * tests/reqd.test: Likewise.
+ * tests/reqd2.test: Likewise.
+ * tests/symlink.test: Likewise.
+ * tests/txinfo22.test: Likewise.
+ * tests/install2.test: Likewise. Also, converted the generated
+ configure.in to a more modern style.
+ * tests/pr224.test: Likewise.
+ * tests/pr9.test: Likewise.
+ * tests/subdir4.test: Likewise.
+ * tests/subobj3.test: Likewise.
+ * tests/subobj8.test: Likewise.
+ * tests/txinfo8.test: Likewise.
+ * tests/depdist.test: Likewise. Also, call `set -e' earlier.
+ * tests/vtexi.test: Likewise.
+ * tests/acloca17: Updated configure.in's line number in grepping
+ of aclocal's error messages.
+ * tests/txinfo29.test: Likewise.
+ * tests/copy.test: Made slighty stricter.
+ * tests/subdir.test: Adapted and extended.
+
2010-04-25 Ralf Wildenhues <address@hidden>
Warning and error message formatting cleanups.
diff --git a/tests/acloca17.test b/tests/acloca17.test
index 884f24b..d893f33 100755
--- a/tests/acloca17.test
+++ b/tests/acloca17.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008, 2010 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
@@ -36,4 +36,4 @@ EOF
WARNINGS=error $ACLOCAL -I m4 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
-grep 'configure.in:4:.*UNDEFINED_MACRO' stderr
+grep 'configure.in:5:.*UNDEFINED_MACRO' stderr
diff --git a/tests/auxdir.test b/tests/auxdir.test
index 95a7a20..15efc9e 100755
--- a/tests/auxdir.test
+++ b/tests/auxdir.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2004, 2007 Free Software Foundation,
Inc.
+# Copyright (C) 1996, 2001, 2002, 2003, 2004, 2007, 2010 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
@@ -16,15 +17,9 @@
# Test to make sure AC_CONFIG_AUX_DIR works correctly.
-. ./defs || Exit 1
-
# The "./." is here so we don't have to mess with subdirs.
-cat > configure.in << 'END'
-AC_INIT([auxdir], [1.0])
-AC_CONFIG_AUX_DIR(./.)
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
+config_auxdir=./.
+. ./defs || Exit 1
cat > Makefile.am << 'END'
pkgdata_DATA =
diff --git a/tests/auxdir2.test b/tests/auxdir2.test
index 590a5df..fac3c17 100755
--- a/tests/auxdir2.test
+++ b/tests/auxdir2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2010 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
@@ -17,17 +17,12 @@
# It should be possible to use a computed auxdir. This might seem
# bizarre, but it is actually used in multilib builds.
+config_auxdir='$foo'
. ./defs || Exit 1
-# The "./." is here so we don't have to mess with subdirs.
-cat > configure.in << 'END'
-AC_INIT([auxdir2], [1.0])
-AC_CONFIG_AUX_DIR($foo)
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
+set -e
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/auxdir3.test b/tests/auxdir3.test
index c828051..9cd4678 100755
--- a/tests/auxdir3.test
+++ b/tests/auxdir3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2010 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
@@ -16,12 +16,13 @@
# Test to make sure we diagnose misplaced AC_CONFIG_AUX_DIR.
+config_auxdir=NONE
. ./defs || Exit 1
set -e
-cat >> configure.in << 'END'
-AC_CONFIG_AUX_DIR(.)
+cat >> configure.in << END
+AC_CONFIG_AUX_DIR([.])
END
: > Makefile.am
diff --git a/tests/auxdir4.test b/tests/auxdir4.test
index 0447809..6a0ea0f 100755
--- a/tests/auxdir4.test
+++ b/tests/auxdir4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2010 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
@@ -16,17 +16,11 @@
# Make sure we diagnose dangerous AC_CONFIG_AUX_DIR names.
+config_auxdir=aux
. ./defs || Exit 1
set -e
-cat >configure.in <<'END'
-AC_INIT([auxdir4], [1.0])
-AC_CONFIG_AUX_DIR([aux])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
-
: > Makefile.am
$ACLOCAL
diff --git a/tests/copy.test b/tests/copy.test
index 770ae51..3ced2b1 100755
--- a/tests/copy.test
+++ b/tests/copy.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2010 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
@@ -18,8 +18,13 @@
. ./defs || Exit 1
+set -e
+
: > Makefile.am
+
rm -f install-sh
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE -c -a
+
+test -f install-sh
diff --git a/tests/defs.in b/tests/defs.in
index 497b57f..d8349c2 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -2,7 +2,7 @@
# @configure_input@
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -293,6 +293,10 @@ cd ./$testSubDir
# config.status really need to append AC_OUTPUT.
{
echo "AC_INIT([$me], [1.0])"
+ if test x"$config_auxdir" != x"NONE"; then
+ # By default, prevent automake from looking in .. and ../..
+ echo "AC_CONFIG_AUX_DIR([${config_auxdir-.}])"
+ fi
if test x"$parallel_tests" = x"yes"; then
echo "AM_INIT_AUTOMAKE([parallel-tests])"
else
diff --git a/tests/depdist.test b/tests/depdist.test
index f36eb47..1b64a35 100755
--- a/tests/depdist.test
+++ b/tests/depdist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -17,23 +17,22 @@
# Make sure depcomp is found for the distribution.
# From Eric Magnien.
+config_auxdir=config
. ./defs || Exit 1
-rm -f configure.in
+set -e
mkdir config
for i in *; do
- if test $i != "config"; then
+ if test $i != "config" && test $i != "configure.in"; then
mv $i config
fi
done
-cat > configure.in << 'END'
-AC_INIT(subdir/foo.c)
-AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+cat >> configure.in << 'END'
AC_PROG_CC
-AC_OUTPUT(subdir/Makefile Makefile)
+AC_CONFIG_FILES([subdir/Makefile])
+AC_OUTPUT
END
cat > Makefile.am << 'END'
@@ -48,8 +47,6 @@ bin_PROGRAMS = foo
foo_SOURCES = foo.c
END
-set -e
-
$ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
diff --git a/tests/install2.test b/tests/install2.test
index d1f27fe..74ef854 100755
--- a/tests/install2.test
+++ b/tests/install2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2006, 2010 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
@@ -19,14 +20,11 @@
required=gzip
. ./defs || Exit 1
+
set -e
-cat > configure.in << 'END'
-AC_INIT
-dnl Prevent automake from looking in .. and ../..
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(foo, 0.1)
-AC_OUTPUT(Makefile)
+cat >> configure.in << 'END'
+AC_OUTPUT
END
cat > Makefile.am << 'END'
diff --git a/tests/mdate3.test b/tests/mdate3.test
index 75105f9..2321964 100755
--- a/tests/mdate3.test
+++ b/tests/mdate3.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2004, 2010 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
@@ -16,15 +17,9 @@
# Test to make sure mdate-sh run correctly.
+config_auxdir=foo
. ./defs || Exit 1
-cat > configure.in << 'END'
-AC_INIT([mdate3], [1.0])
-AC_CONFIG_AUX_DIR([foo])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
-
cat > Makefile.am << 'END'
info_TEXINFOS = textutils.texi
END
diff --git a/tests/parallel-am.test b/tests/parallel-am.test
index c46377b..59d3ac0 100755
--- a/tests/parallel-am.test
+++ b/tests/parallel-am.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 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
@@ -36,18 +36,15 @@
# This test checks (0), (1), and (2). See sister tests for further coverage.
required=perl-threads
+config_auxdir=build-aux
. ./defs || Exit 1
set -e
-cat > configure.in << 'END'
-AC_INIT([parallel-am], [1.0])
-AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
+cat >> configure.in << 'END'
AC_PROG_CC
AM_PATH_LISPDIR
AM_PATH_PYTHON
-AC_CONFIG_FILES([Makefile])
END
cat > Makefile.am << 'END'
diff --git a/tests/parallel-am3.test b/tests/parallel-am3.test
index 104376a..c8a8777 100755
--- a/tests/parallel-am3.test
+++ b/tests/parallel-am3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 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
@@ -22,18 +22,15 @@
# installation of aux files should be race-free,
required=perl-threads
+config_auxdir=build-aux
. ./defs || Exit 1
set -e
-cat > configure.in << 'END'
-AC_INIT([parallel-am], [1.0])
-AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
+cat >> configure.in << 'END'
AC_PROG_CC
AM_PATH_LISPDIR
AM_PATH_PYTHON
-AC_CONFIG_FILES([Makefile])
END
cat > Makefile.am << 'END'
diff --git a/tests/pr224.test b/tests/pr224.test
index fdcb997..2c06352 100755
--- a/tests/pr224.test
+++ b/tests/pr224.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2010 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
@@ -31,13 +31,10 @@ bin_PROGRAMS = bar
bar_SOURCES = foo/main.c
EOF
-cat >configure.in <<'EOF'
-AC_INIT(foo/main.c)
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(test_am, 1.0)
+cat >>configure.in <<'EOF'
AC_PROG_CC
AM_PROG_CC_C_O
-AC_OUTPUT(Makefile)
+AC_OUTPUT
EOF
touch README NEWS AUTHORS ChangeLog
diff --git a/tests/pr9.test b/tests/pr9.test
index dab9734..0850065 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2010 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
@@ -17,13 +17,11 @@
# Test for bug in PR 9.
required=gzip
+config_auxdir=support
. ./defs || Exit 1
-cat > configure.in << 'END'
-AC_INIT(Makefile.am)
-AC_CONFIG_AUX_DIR(support)
-AM_INIT_AUTOMAKE(pr9, 0)
-AC_OUTPUT(Makefile)
+cat >> configure.in << 'END'
+AC_OUTPUT
END
: > Makefile.am
@@ -38,6 +36,6 @@ $AUTOMAKE -a -c || Exit 1
$MAKE || Exit 1
$MAKE distcheck || Exit 1
-gunzip pr9-0.tar.gz || Exit 1
+gunzip pr9-1.0.tar.gz || Exit 1
-tar tf pr9-0.tar | $FGREP support
+tar tf pr9-1.0.tar | $FGREP support
diff --git a/tests/reqd.test b/tests/reqd.test
index 58a8839..9f55850 100755
--- a/tests/reqd.test
+++ b/tests/reqd.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2010 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
@@ -17,6 +17,7 @@
# Make sure Automake will install several copies of required files if needed.
# Reported by Marius Vollmer.
+config_auxdir=NONE
. ./defs || Exit 1
set -e
diff --git a/tests/reqd2.test b/tests/reqd2.test
index b47ef15..80af70c 100755
--- a/tests/reqd2.test
+++ b/tests/reqd2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2010 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
@@ -19,15 +19,12 @@
# to fix the Makefiles.)
required='libtoolize'
+config_auxdir=autoconf
. ./defs || Exit 1
set -e
-cat > configure.in << 'END'
-AC_INIT([req2], [1.0])
-AC_CONFIG_AUX_DIR([autoconf])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
+cat >> configure.in << 'END'
AC_PROG_CC
AM_PROG_LIBTOOL
AC_CONFIG_FILES([autoconf/Makefile main/Makefile])
diff --git a/tests/subdir.test b/tests/subdir.test
index 85db059..e138597 100755
--- a/tests/subdir.test
+++ b/tests/subdir.test
@@ -19,12 +19,12 @@
. ./defs || Exit 1
+set -e
+
mkdir zot
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile zot/Makefile)
+cat >> configure.in << 'END'
+AC_CONFIG_FILES([zot/Makefile])
END
cat > Makefile.am << 'END'
@@ -35,5 +35,11 @@ cat > zot/Makefile.am << 'END'
pkgdata_DATA =
END
-$ACLOCAL || Exit 1
+$ACLOCAL
+$AUTOMAKE
+
+# And now try with auxdir not explicitly specified
+sed '/^AC_CONFIG_AUX_DIR(/d' configure.in > configure.tmp
+mv -f configure.tmp configure.in
+
$AUTOMAKE
diff --git a/tests/subdir4.test b/tests/subdir4.test
index 2f85213..9a6833a 100755
--- a/tests/subdir4.test
+++ b/tests/subdir4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2010 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
@@ -14,19 +14,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure a top-level depcomp file is found when
-# AC_CONFIG_AUX_DIR is not specified.
+# Make sure a top-level depcomp file is found when AC_CONFIG_AUX_DIR
+# is not specified.
+config_auxdir=NONE
. ./defs || Exit 1
mkdir lib src
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+cat >> configure.in << 'END'
AC_PROG_RANLIB
AC_PROG_CC
-AC_OUTPUT(Makefile lib/Makefile src/Makefile)
+AC_CONFIG_FILES([lib/Makefile src/Makefile])
+AC_OUTPUT
END
# Files required because we are using `--gnu'.
diff --git a/tests/subobj3.test b/tests/subobj3.test
index a4ba765..165e8d1 100755
--- a/tests/subobj3.test
+++ b/tests/subobj3.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2010 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
@@ -22,16 +22,12 @@ required=gcc
set -e
-cat > configure.in << 'END'
-AC_INIT(sub/hello.c)
-dnl Prevent automake from looking in .. and ../..
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(hello,0.23)
+cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_CC_STDC
AM_PROG_CC_C_O
AM_C_PROTOTYPES
-AC_OUTPUT(Makefile)
+AC_OUTPUT
END
cat > Makefile.am << 'END'
diff --git a/tests/subobj8.test b/tests/subobj8.test
index 63a02d1..16e6276 100755
--- a/tests/subobj8.test
+++ b/tests/subobj8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -16,15 +16,14 @@
# Make sure `compile' is included when subdir-objects is used in a subdir.
+config_auxdir=tools
. ./defs || Exit 1
-cat > configure.in << 'END'
-AC_INIT(Makefile.am)
-AC_CONFIG_AUX_DIR(tools)
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+cat >> configure.in << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
-AC_OUTPUT(Makefile foo/Makefile)
+AC_CONFIG_FILES([foo/Makefile])
+AC_OUTPUT
END
mkdir tools foo foo/bar
diff --git a/tests/symlink.test b/tests/symlink.test
index a9b12c5..43322a9 100755
--- a/tests/symlink.test
+++ b/tests/symlink.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1999, 2001, 2002, 2003, 2004 Free Software Foundation,
Inc.
+# Copyright (C) 1996, 1999, 2001, 2002, 2003, 2004, 2010 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
@@ -17,6 +18,7 @@
# Make sure we get an error if symlink creation fails.
# Reported by Joerg-Martin Schwarz
+config_auxdir=sub
. ./defs || Exit 1
set -e
@@ -26,13 +28,6 @@ rm -f mkinstalldirs
: > Makefile.am
-cat > configure.in << 'END'
-AC_INIT([symlink], [1.0])
-AC_CONFIG_AUX_DIR(sub)
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
-
$ACLOCAL
AUTOMAKE_fails --add-missing
grep 'error while making link' stderr
diff --git a/tests/txinfo22.test b/tests/txinfo22.test
index 3c2265d..1b52cc7 100755
--- a/tests/txinfo22.test
+++ b/tests/txinfo22.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2007, 2008, 2010 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
@@ -20,16 +21,13 @@
# but preserve them in the output.
# Also make sure TEXINFO_TEX is not distributed.
+config_auxdir=aux1
required='makeinfo tex texi2dvi'
. ./defs || Exit 1
set -e
-cat > configure.in << 'END'
-AC_INIT([txinfo22], [1.0])
-AC_CONFIG_AUX_DIR([aux1])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
+cat >> configure.in << 'END'
AC_OUTPUT
END
diff --git a/tests/txinfo29.test b/tests/txinfo29.test
index 1d4aeff..46e0359 100755
--- a/tests/txinfo29.test
+++ b/tests/txinfo29.test
@@ -50,7 +50,7 @@ echo 'AC_SUBST([INFO_DEPS])' >>configure.in
rm -rf autom4te.cache # Make sure autoconf sees the configure.in update.
AUTOMAKE_fails
-grep '^configure.in:4:.*user variable.*INFO_DEPS' stderr
+grep '^configure.in:5:.*user variable.*INFO_DEPS' stderr
grep 'overrides Automake variable.*INFO_DEPS' stderr
$AUTOMAKE -Wno-override
diff --git a/tests/txinfo8.test b/tests/txinfo8.test
index 7975b28..6591082 100755
--- a/tests/txinfo8.test
+++ b/tests/txinfo8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2010 Free Software
# Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -16,16 +16,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test to make sure texinfo.tex is correctly installed and disted by
-# -a when we're using AC_CONFIG_AUX_DIR. Bug report by by Per
-# Cederqvist.
+# -a when we're using AC_CONFIG_AUX_DIR. Bug report by Per Cederqvist.
+config_auxdir=sub
. ./defs || Exit 1
-cat > configure.in << 'END'
-AC_INIT
-AC_CONFIG_AUX_DIR(sub)
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile sub/Makefile)
+cat >> configure.in << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
END
cat > Makefile.am << 'END'
diff --git a/tests/vtexi.test b/tests/vtexi.test
index c28a356..15b8387 100755
--- a/tests/vtexi.test
+++ b/tests/vtexi.test
@@ -15,8 +15,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+config_auxdir=NONE
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
info_TEXINFOS = textutils.texi
END
@@ -30,9 +33,7 @@ END
: > mdate-sh
: > texinfo.tex
-set -e
-
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
# Test for bug reported by Jim Meyering:
--
1.6.5
- [PATCH 1/2] Tests init: default definition of AC_CONFIG_AUX_DIR,
Stefano Lattarini <=