Remove the "gnits" option; it prohibits my using "+" as a version

string suffix, and all it does (beyond the default "gnu" option)
is to _require_ the THANKS file.
* configure.ac (AM_INIT_AUTOMAKE): Remove it.

Remove all AUTOMAKE_OPTIONS settings in Makefile.am files.
* tests/chgrp/Makefile.am, tests/chmod/Makefile.am:
* tests/chown/Makefile.am, tests/cp/Makefile.am:
* tests/du/Makefile.am, tests/expr/Makefile.am:
* tests/factor/Makefile.am, tests/general/Makefile.am:
* tests/install/Makefile.am, tests/ln/Makefile.am:
* tests/ls/Makefile.am, tests/mkdir/Makefile.am:
* tests/mv/Makefile.am, tests/readlink/Makefile.am:
* tests/rm/Makefile.am, tests/rmdir/Makefile.am:
* tests/seq/Makefile.am, tests/stty/Makefile.am:
* tests/tee/Makefile.am, tests/touch/Makefile.am:

diff --git a/ChangeLog b/ChangeLog
index 56862cee1e23bac4124b2f7448c25d5f2f0c94b4..1ffa3014a893770877c8ed5ad62ded7e986d99a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2007-02-24  Jim Meyering  <jim@meyering.net>
 
+       Remove the "gnits" option; it prohibits my using "+" as a version
+       string suffix, and all it does (beyond the default "gnu" option)
+       is to _require_ the THANKS file.
+       * configure.ac (AM_INIT_AUTOMAKE): Remove it.
+
+       Remove all AUTOMAKE_OPTIONS settings in Makefile.am files.
+       * tests/chgrp/Makefile.am, tests/chmod/Makefile.am:
+       * tests/chown/Makefile.am, tests/cp/Makefile.am:
+       * tests/du/Makefile.am, tests/expr/Makefile.am:
+       * tests/factor/Makefile.am, tests/general/Makefile.am:
+       * tests/install/Makefile.am, tests/ln/Makefile.am:
+       * tests/ls/Makefile.am, tests/mkdir/Makefile.am:
+       * tests/mv/Makefile.am, tests/readlink/Makefile.am:
+       * tests/rm/Makefile.am, tests/rmdir/Makefile.am:
+       * tests/seq/Makefile.am, tests/stty/Makefile.am:
+       * tests/tee/Makefile.am, tests/touch/Makefile.am:
+
        * README: Document the OSF/1 4.0d build failure and work-around.
        Reported by Bruno Haible.
 

diff --git a/configure.ac b/configure.ac
index a1e09333f8d00900f480944d41b84a321f0f1646..393d7bb7e53a9a04b13c4b595e31363dad2ce934 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
 
 AB_INIT()
-AM_INIT_AUTOMAKE([1.10 gnits dist-bzip2])
+AM_INIT_AUTOMAKE([1.10 dist-bzip2])
 
 AC_PROG_CC_STDC
 AM_PROG_CC_C_O

diff --git a/tests/chgrp/Makefile.am b/tests/chgrp/Makefile.am
index 6ffa9b753915775fdcb28125c533a7ebc34b7da6..8dffd0157448f6e21fd28b74f5d914053a5a3184 100644 (file)
--- a/tests/chgrp/Makefile.am
+++ b/tests/chgrp/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.4 gnits
-
 TESTS = \
   default-no-deref \
   basic \

diff --git a/tests/chmod/Makefile.am b/tests/chmod/Makefile.am
index 0eac486390a27b31de604d76f74ff24849aea8bb..1388961a67cdfe5e767978cee8dfc474bddd94ae 100644 (file)
--- a/tests/chmod/Makefile.am
+++ b/tests/chmod/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.4 gnits
-
 TESTS = \
   inaccessible \
   c-option \

diff --git a/tests/chown/Makefile.am b/tests/chown/Makefile.am
index e452a011080c975f0b30ea27f482b64f0b23cc31..61e65818f82f4357a1847952ff552257f7537785 100644 (file)
--- a/tests/chown/Makefile.am
+++ b/tests/chown/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.4 gnits
-
 TESTS = \
   preserve-root \
   basic \

diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am
index 8c978ee421eb91ae54abf597ff6092219b2e4299..f9925dbc4386c462d72bcd65288a15e5b89432c3 100644 (file)
--- a/tests/cp/Makefile.am
+++ b/tests/cp/Makefile.am
@@ -17,8 +17,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-AUTOMAKE_OPTIONS = 1.1 gnits
-
 TESTS = \
   file-perm-race parent-perm-race \
   backup-dir \

diff --git a/tests/du/Makefile.am b/tests/du/Makefile.am
index 1527450162851669aae131ada237fa2b5268a359..3149cfac62b1ed3f642c272371bc12ff3dc799f4 100644 (file)
--- a/tests/du/Makefile.am
+++ b/tests/du/Makefile.am
@@ -1,7 +1,6 @@
 # Make coreutils tests for "du".                       -*-Makefile-*-
 
-# Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000, 2002-2007 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 +17,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-AUTOMAKE_OPTIONS = 1.4 gnits
-
 TESTS = \
   one-file-system \
   inacc-dest \

diff --git a/tests/expr/Makefile.am b/tests/expr/Makefile.am
index e63e4a129128a3452fa64183300e4214fed48df2..7440c74dc12b5a98f6261a6c82e32787b3e6ecb1 100644 (file)
--- a/tests/expr/Makefile.am
+++ b/tests/expr/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.3b gnits
-
 TESTS = basic
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \

diff --git a/tests/factor/Makefile.am b/tests/factor/Makefile.am
index a77612944c09bf0edaf07055555061dd664a1637..dedc143bb241839d0cb1fef50bede582467986bc 100644 (file)
--- a/tests/factor/Makefile.am
+++ b/tests/factor/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.3b gnits
-
 TESTS = basic
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \

diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index aba767aa825efdd902302ce9764982ad3e36af59..1dbc1d1f62d4e739a1fb6d48d9e5f46b9bf0e136 100644 (file)
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 
 ## Makefile for Autoconf testsuite.
-## Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+## Copyright (C) 2000, 2003, 2007 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,6 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 
-AUTOMAKE_OPTIONS = gnits
-
 SUITE = suite.at dd.at m4sh.at
 
 EXTRA_DIST = $(SUITE) testsuite

diff --git a/tests/install/Makefile.am b/tests/install/Makefile.am
index 4e262ee9eabb0446d3f043bb7604fabdc4512e99..5544d7d50d6babf1efa9b7037b98c7f0387dfdf7 100644 (file)
--- a/tests/install/Makefile.am
+++ b/tests/install/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.3 gnits
-
 TESTS = trap basic-1 create-leading d-slashdot
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \

diff --git a/tests/ln/Makefile.am b/tests/ln/Makefile.am
index 0f970783cbeb4bc320e0971c00488ea3d4a34e90..7ae15a75b16b7e02afb26086ed5ef477ffdb8bab 100644 (file)
--- a/tests/ln/Makefile.am
+++ b/tests/ln/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.2 gnits
-
 TESTS = hard-backup target-1 sf-1 misc backup-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \

diff --git a/tests/ls/Makefile.am b/tests/ls/Makefile.am
index 36d7b4f2c1f388c87cd55ec600a4af93d219b6fa..461ba0756b8aff5b8ed81cc13f545dfd07e2b46b 100644 (file)
--- a/tests/ls/Makefile.am
+++ b/tests/ls/Makefile.am
@@ -1,7 +1,6 @@
 # Make coreutils tests for "ls".               -*-Makefile-*-
 
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006 Free
-# Software Foundation, Inc.
+# Copyright (C) 1997-2003, 2006-2007 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 +17,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-AUTOMAKE_OPTIONS = 1.2 gnits
-
 TESTS = \
   nameless-uid \
   color-dtype-dir \

diff --git a/tests/mkdir/Makefile.am b/tests/mkdir/Makefile.am
index ab217af474fc1f26c621d8879324eb243b0fdf22..fc2ab777d8b1e5a2930f5ac3396514f012814be0 100644 (file)
--- a/tests/mkdir/Makefile.am
+++ b/tests/mkdir/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.1 gnits
-
 TESTS = \
   p-thru-slink \
   p-3 p-1 p-2 p-v special-1 perm parents t-slash p-slashdot

diff --git a/tests/mv/Makefile.am b/tests/mv/Makefile.am
index dcc6d227f32de3a3971f4d478f221d9f5527aa79..71c9119948bcf29b8277bbac56daa561bd7b603b 100644 (file)
--- a/tests/mv/Makefile.am
+++ b/tests/mv/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils tests for "mv".                       -*-Makefile-*-
 
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -18,8 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-AUTOMAKE_OPTIONS = 1.3 gnits
-
 TESTS = \
   hard-verbose \
   backup-dir \

diff --git a/tests/readlink/Makefile.am b/tests/readlink/Makefile.am
index c6a5945cb9f3f1e7d3765f0e9ad6ead4dd06c029..4ff7ef37a0b24df1d948608747631a427f1423d5 100644 (file)
--- a/tests/readlink/Makefile.am
+++ b/tests/readlink/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.4 gnits
-
 TESTS = rl-1 can-e can-f can-m
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \

diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am
index 4c212b9d67c4fef1e734b31f2a8725668dd9787f..e946489450a2400bc635efc62e15854fbd626993 100644 (file)
--- a/tests/rm/Makefile.am
+++ b/tests/rm/Makefile.am
@@ -18,8 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-AUTOMAKE_OPTIONS = 1.1 gnits
-
 TESTS = \
   i-never \
   fail-eacces \

diff --git a/tests/rmdir/Makefile.am b/tests/rmdir/Makefile.am
index e1c96437e0f5450c5a057dd36e71c65d2df33f26..eadbaba33db2da2e1e9d5d602cc30688d9d64dc0 100644 (file)
--- a/tests/rmdir/Makefile.am
+++ b/tests/rmdir/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.4 gnits
-
 TESTS = fail-perm ignore t-slash
 
 EXTRA_DIST = $(TESTS)

diff --git a/tests/seq/Makefile.am b/tests/seq/Makefile.am
index 3af0268b903713f2227af60fafb820e45c89950a..7463a5d3a0d66d829e0ead2411a178d4e846ebf7 100644 (file)
--- a/tests/seq/Makefile.am
+++ b/tests/seq/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.3b gnits
-
 TESTS = basic
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \

diff --git a/tests/stty/Makefile.am b/tests/stty/Makefile.am
index 003b7eb1388ab702dfd60b6a810b01348500516f..5cd33b5f2b9943042523446025763f53a1a8cb9a 100644 (file)
--- a/tests/stty/Makefile.am
+++ b/tests/stty/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.2f gnits
-
 TESTS = row-col-1 basic-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \

diff --git a/tests/tee/Makefile.am b/tests/tee/Makefile.am
index c4b8b2993bdb20cb3ce7f28382eadf5cb6931da1..48f3239af99ff22e657aa41096a49017dfb2bf84 100644 (file)
--- a/tests/tee/Makefile.am
+++ b/tests/tee/Makefile.am
@@ -1,6 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-AUTOMAKE_OPTIONS = 1.4 gnits
-
 TESTS = basic dash
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \

diff --git a/tests/touch/Makefile.am b/tests/touch/Makefile.am
index aabdb0900119b7449fb24d046b14ecbf86db5827..1fce9cd6797fe64445a543edd1d8f8ddb49fb1d6 100644 (file)
--- a/tests/touch/Makefile.am
+++ b/tests/touch/Makefile.am
@@ -1,7 +1,6 @@
 # Make coreutils tests for "touch".            -*-Makefile-*-
 
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 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 +17,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-AUTOMAKE_OPTIONS = 1.3 gnits
-
 TESTS = \
   read-only \
   relative \