[PATCH 3/6] Fix test acoutbs2.test.

[Stefano Lattarini]

This patch fixes some bugs in the test script acoutbs2.test (missing 
AM_INIT_AUTOMAKE and AC_INIT, missing call to $ACLOCAL), which 
prevented it from working.

From 9566f9fba3b50d5fecf4142468d80379718bc368 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Fri, 25 Dec 2009 23:19:53 +0100
Subject: [PATCH 3/6] Fix test acoutbs2.test.

* tests/acoutbs2: In the generated configure.in: add proper calls
to AC_INIT and AM_INIT_AUTOMAKE, and remove explicit definition of
PACKAGE and VERSION. Add a call to aclocal before calling automake.
Updated copyright years.
* tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test.
---
 ChangeLog           |    7 +++++++
 tests/Makefile.am   |    1 -
 tests/Makefile.in   |    1 -
 tests/acoutbs2.test |    7 ++++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 39ac8da..0dfd7b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-12-25  Stefano Lattarini  <address@hidden>
 
+       Fix test acoutbs2.test.
+       * tests/acoutbs2: In the generated configure.in: add proper calls
+       to AC_INIT and AM_INIT_AUTOMAKE, and remove explicit definition of
+       PACKAGE and VERSION. Add a call to aclocal before calling automake.
+       Updated copyright years.
+       * tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test.
+
        Add forgotten test scripts to $(TESTS).
        * tests/Makefile.am (TESTS): Added test scripts present on the
        filesystem, which were erroneously left out from $(TESTS):
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 35dc69a..eac4738 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
 XFAIL_TESTS =                                  \
-acoutbs2.test                                  \
 all.test                                       \
 auxdir2.test                                   \
 cond17.test                                    \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 30721f0..fa2b3d0 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -234,7 +234,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 XFAIL_TESTS = \
-acoutbs2.test                                  \
 all.test                                       \
 auxdir2.test                                   \
 cond17.test                                    \
diff --git a/tests/acoutbs2.test b/tests/acoutbs2.test
index 2df24c2..8af1be2 100755
--- a/tests/acoutbs2.test
+++ b/tests/acoutbs2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2000, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2000, 2002, 2009  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,8 +20,8 @@
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
-PACKAGE=nonesuch
-VERSION=nonesuch
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -34,4 +34,5 @@ END
 : > Makefile.am
 : > zot.in
 
+$ACLOCAL || Exit 1
 $AUTOMAKE
-- 
1.6.5