* tests/acoutnoq.test, tests/acoutput.test, tests/acoutqnl.test,

* tests/acouttbs.test, tests/auxdir.test, tests/colon.test,
* tests/colon2.test, tests/colon3.test, tests/colon4.test,
* tests/colon5.test, tests/colon6.test, tests/colon7.test,
* tests/conf2.test, tests/config.test, tests/depcomp.test,
* tests/depcomp2.test, tests/discover.test, tests/fpinst2.test,
* tests/fpinstall.test, tests/ldadd.test, tests/libobj7.test,
* tests/libobj8.test, tests/output.test, tests/output2.test,
* tests/output3.test, tests/output4.test, tests/output5.test,
* tests/pr2.test, tests/remake.test, tests/remake2.test,
* tests/remake3.test, tests/scripts.test, tests/stamph.test,
* tests/subdir.test, tests/subdir2.test, tests/subdir4.test,
* tests/tagsub.test, tests/texinfo8.test: Remove PACKAGE and VERSION
assignments.

diff --git a/ChangeLog b/ChangeLog
index d5e1a56..ccea442 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2001-10-28  Akim Demaille  <akim@epita.fr>
 
+       * tests/acoutnoq.test, tests/acoutput.test, tests/acoutqnl.test,
+       * tests/acouttbs.test, tests/auxdir.test, tests/colon.test,
+       * tests/colon2.test, tests/colon3.test, tests/colon4.test,
+       * tests/colon5.test, tests/colon6.test, tests/colon7.test,
+       * tests/conf2.test, tests/config.test, tests/depcomp.test,
+       * tests/depcomp2.test, tests/discover.test, tests/fpinst2.test,
+       * tests/fpinstall.test, tests/ldadd.test, tests/libobj7.test,
+       * tests/libobj8.test, tests/output.test, tests/output2.test,
+       * tests/output3.test, tests/output4.test, tests/output5.test,
+       * tests/pr2.test, tests/remake.test, tests/remake2.test,
+       * tests/remake3.test, tests/scripts.test, tests/stamph.test,
+       * tests/subdir.test, tests/subdir2.test, tests/subdir4.test,
+       * tests/tagsub.test, tests/texinfo8.test: Remove PACKAGE and VERSION
+       assignments.
+
+2001-10-28  Akim Demaille  <akim@epita.fr>
+
        * automake.in (&scan_autoconf_traces): Use eq for equality.
        Anchor regexps.
        Remove dead comment.

diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
index 3e9cc7b..d62f919 100755 (executable)
--- a/tests/acoutnoq.test
+++ b/tests/acoutnoq.test
@@ -11,8 +11,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile, [true])
 END
 

diff --git a/tests/acoutput.test b/tests/acoutput.test
index aa41caa..4cef8dd 100755 (executable)
--- a/tests/acoutput.test
+++ b/tests/acoutput.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT([Makefile], [true])
 END
 

diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test
index 39101ab..f641408 100755 (executable)
--- a/tests/acoutqnl.test
+++ b/tests/acoutqnl.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT([Makefile],
 [echo zardoz has spoken])
 END

diff --git a/tests/acouttbs.test b/tests/acouttbs.test
index 07e79c7..4b13ba4 100755 (executable)
--- a/tests/acouttbs.test
+++ b/tests/acouttbs.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile \
 zot)
 END

diff --git a/tests/auxdir.test b/tests/auxdir.test
index 8b42f68..18d6e47 100755 (executable)
--- a/tests/auxdir.test
+++ b/tests/auxdir.test
@@ -6,8 +6,6 @@
 
 # The "./." is here so we don't have to mess with subdirs.
 cat >> configure.in << 'END'
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_CONFIG_AUX_DIR(./.)
 END
 

diff --git a/tests/colon.test b/tests/colon.test
index f143973..adcbc20 100755 (executable)
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile foo.h:foo.hin)
 END
 

diff --git a/tests/colon2.test b/tests/colon2.test
index afa2bf3..6ce57ca 100755 (executable)
--- a/tests/colon2.test
+++ b/tests/colon2.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile:zardoz.in)
 END
 

diff --git a/tests/colon3.test b/tests/colon3.test
index 29913db..3e5d6b7 100755 (executable)
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile:zardoz.in:two.in:three.in)
 END
 

diff --git a/tests/colon4.test b/tests/colon4.test
index d433c44..0bef951 100755 (executable)
--- a/tests/colon4.test
+++ b/tests/colon4.test
@@ -9,8 +9,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile zardoz:one:two:three)
 END
 

diff --git a/tests/colon5.test b/tests/colon5.test
index 799d5e3..083a2bb 100755 (executable)
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile:Makefile.in:Makefile.dep)
 END
 

diff --git a/tests/colon6.test b/tests/colon6.test
index 36e3cd6..6bf91d9 100755 (executable)
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(demo/Makefile demo/version.good:demo/version.gin)
 END
 

diff --git a/tests/colon7.test b/tests/colon7.test
index a56012e..ec4ed24 100755 (executable)
--- a/tests/colon7.test
+++ b/tests/colon7.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(subdir/bar:subdir/foo \
    Makefile \
    subdir/Makefile

diff --git a/tests/conf2.test b/tests/conf2.test
index b5af635..fa9bde7 100755 (executable)
--- a/tests/conf2.test
+++ b/tests/conf2.test
@@ -8,8 +8,6 @@ cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AM_CONFIG_HEADER(config.h two.h)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_OUTPUT(Makefile)
 END

diff --git a/tests/config.test b/tests/config.test
index 1db3559..d609454 100755 (executable)
--- a/tests/config.test
+++ b/tests/config.test
@@ -9,8 +9,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AM_CONFIG_HEADER(subdir/config.h)
 AC_PROG_CC
 AC_OUTPUT(Makefile)

diff --git a/tests/depcomp.test b/tests/depcomp.test
index f60ad0c..1c28e5f 100755 (executable)
--- a/tests/depcomp.test
+++ b/tests/depcomp.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_OUTPUT(subdir/Makefile subdir2/Makefile)
 END

diff --git a/tests/depcomp2.test b/tests/depcomp2.test
index 3dc002a..e9771b6 100755 (executable)
--- a/tests/depcomp2.test
+++ b/tests/depcomp2.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT(subdir/foo.c)
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_OUTPUT(Makefile subdir/Makefile)
 END

diff --git a/tests/discover.test b/tests/discover.test
index 39a93cd..35f05cd 100755 (executable)
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -5,8 +5,6 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_RANLIB
 AC_PROG_CC
 LIBOBJS="$LIBOBJS fsusage.o"

diff --git a/tests/fpinst2.test b/tests/fpinst2.test
index 7637ccc..600ed37 100755 (executable)
--- a/tests/fpinst2.test
+++ b/tests/fpinst2.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile)
 END
 

diff --git a/tests/fpinstall.test b/tests/fpinstall.test
index a47b736..fba18f4 100755 (executable)
--- a/tests/fpinstall.test
+++ b/tests/fpinstall.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile)
 END
 

diff --git a/tests/ldadd.test b/tests/ldadd.test
index be97b59..ff31677 100755 (executable)
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -5,8 +5,6 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_PROG_LIBTOOL
 AC_OUTPUT(Makefile)

diff --git a/tests/libobj7.test b/tests/libobj7.test
index ebfe3d0..2c7ddf0 100755 (executable)
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_REPLACE_FUNCS(basename dirname strsignal)

diff --git a/tests/libobj8.test b/tests/libobj8.test
index 0382813..4c31af9 100755 (executable)
--- a/tests/libobj8.test
+++ b/tests/libobj8.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_REPLACE_FUNCS(basename dirname strsignal)

diff --git a/tests/output.test b/tests/output.test
index b2b8c8c..675f169 100755 (executable)
--- a/tests/output.test
+++ b/tests/output.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile frob/zardoz)
 END
 

diff --git a/tests/output2.test b/tests/output2.test
index 086b974..b2c22a1 100755 (executable)
--- a/tests/output2.test
+++ b/tests/output2.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile intl/intlh.inst po/Makefile.in misc/gettextize)
 END
 

diff --git a/tests/output3.test b/tests/output3.test
index f9e01a5..a913ad6 100755 (executable)
--- a/tests/output3.test
+++ b/tests/output3.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT([Makefile
 tests/Makefile tests/defs],
 [blah])

diff --git a/tests/output4.test b/tests/output4.test
index 46695c6..f17493f 100755 (executable)
--- a/tests/output4.test
+++ b/tests/output4.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(tests/Makefile tests/defs)
 END
 

diff --git a/tests/output5.test b/tests/output5.test
index e354db0..aed7393 100755 (executable)
--- a/tests/output5.test
+++ b/tests/output5.test
@@ -5,8 +5,6 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT()
 END
 

diff --git a/tests/pr2.test b/tests/pr2.test
index 7f8b00c..c93be6d 100755 (executable)
--- a/tests/pr2.test
+++ b/tests/pr2.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(README.foo:templ/README.foo.in Makefile)
 END
 

diff --git a/tests/remake.test b/tests/remake.test
index eed132b..f340abe 100755 (executable)
--- a/tests/remake.test
+++ b/tests/remake.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(sub/Makefile)
 END
 

diff --git a/tests/remake2.test b/tests/remake2.test
index b57d41e..bee0ff5 100755 (executable)
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(sub/Makefile)
 END
 

diff --git a/tests/remake3.test b/tests/remake3.test
index f3b08fd..1bfa2dd 100755 (executable)
--- a/tests/remake3.test
+++ b/tests/remake3.test
@@ -7,8 +7,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile sub/foo)
 END
 

diff --git a/tests/scripts.test b/tests/scripts.test
index 02052b6..f4c8c54 100755 (executable)
--- a/tests/scripts.test
+++ b/tests/scripts.test
@@ -8,8 +8,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile)
 END
 

diff --git a/tests/stamph.test b/tests/stamph.test
index 0c14c02..919bdf9 100755 (executable)
--- a/tests/stamph.test
+++ b/tests/stamph.test
@@ -5,8 +5,6 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile stamp-h)
 END
 

diff --git a/tests/subdir.test b/tests/subdir.test
index 9365244..bbc9fbe 100755 (executable)
--- a/tests/subdir.test
+++ b/tests/subdir.test
@@ -10,8 +10,6 @@ mkdir zot
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile zot/Makefile)
 END
 

diff --git a/tests/subdir2.test b/tests/subdir2.test
index 50876cf..d116d0e 100755 (executable)
--- a/tests/subdir2.test
+++ b/tests/subdir2.test
@@ -10,8 +10,6 @@ mkdir one/two
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile one/Makefile one/two/Makefile)
 END
 

diff --git a/tests/subdir4.test b/tests/subdir4.test
index 366743a..12b88b1 100755 (executable)
--- a/tests/subdir4.test
+++ b/tests/subdir4.test
@@ -10,8 +10,6 @@ mkdir lib src
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_PROG_RANLIB
 AC_PROG_CC
 AC_OUTPUT(Makefile lib/Makefile src/Makefile)

diff --git a/tests/tagsub.test b/tests/tagsub.test
index 174774e..1d05beb 100755 (executable)
--- a/tests/tagsub.test
+++ b/tests/tagsub.test
@@ -20,8 +20,6 @@ END
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile sub/Makefile)
 END
 

diff --git a/tests/texinfo8.test b/tests/texinfo8.test
index 5430b6e..98cfdbe 100755 (executable)
--- a/tests/texinfo8.test
+++ b/tests/texinfo8.test
@@ -9,8 +9,6 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
 AC_OUTPUT(Makefile sub/Makefile)
 AC_CONFIG_AUX_DIR(sub)
 END