.

13 files changed, 27 insertions, 14 deletions

diff --git a/m4/Makefile.in b/m4/Makefile.in
index ff4f4f6cb..8c4df6440 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -62,7 +62,6 @@ CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
-DF_PROG = @DF_PROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -77,17 +76,16 @@ LIBOBJS = @LIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MVDIR_PROG = @MVDIR_PROG@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
+POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-YACC = @YACC@
 l = @l@
 
 
diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog
index 5a2446cca..aa9ad68a8 100644
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-26  Jim Meyering  <meyering@ascend.com>
+
+	* lib/Makefile.am (libfu_a_SOURCES): Add version-etc.c.
+	(noinst_HEADERS): Add version-etc.h.
+
 1999-03-25  Jim Meyering  <meyering@ascend.com>
 
 	* src/tail.c (recheck): Factor out a block of duplicated code.
diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index 13259a235..09b7a7b49 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -78,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -88,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 x = cut
 explicit = 
 maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X 8.I 8.X 9.I 9.X a.I a.X b.I b.X c.I c.X d.I d.X e.I e.X f.I f.X g.I g.X h.I h.X i.I i.X j.I j.X k.I k.X l.I l.X m.I m.X n.I n.X o.I o.X p.I p.X q.I q.X r.I r.X s.I s.X t.I t.X u.I u.X v.I v.X w.I w.X x.I x.X y.I y.X z.I z.X empty-fl.I empty-fl.X missing-fl.I missing-fl.X empty-bl.I empty-bl.X missing-bl.I missing-bl.X empty-f1.I empty-f1.X empty-f2.I empty-f2.X o-delim.I o-delim.X nul-idelim.I nul-idelim.X nul-odelim.I nul-odelim.X multichar-od.I multichar-od.X 8bit-delim.I 8bit-delim.X
diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in
index f6a24ea7f..382fa0ca7 100644
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -78,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -88,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 x = head
 explicit = in in-1024
 maint_gen = idem-0.I idem-0.X idem-1.I idem-1.X idem-2.I idem-2.X idem-3.I idem-3.X basic-0-10.I basic-0-10.X basic-0-09.I basic-0-09.X basic-0-11.I basic-0-11.X obs-0.I obs-0.X obs-1.I obs-1.X obs-2.I obs-2.X obs-3.I obs-3.X fail-1.I fail-1.X null-1.I null-1.X posix-0.I posix-0.X posix-1.I posix-1.X posix-2.I posix-2.X posix-3.I posix-3.X
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index 9254f4a4c..c8468a3e9 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -78,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -88,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 x = join
 explicit = 
 maint_gen = 1a.I1 1a.I2 1a.X 1b.I1 1b.I2 1b.X 1c.I1 1c.I2 1c.X 1d.I1 1d.I2 1d.X 1e.I1 1e.I2 1e.X 1f.I1 1f.I2 1f.X 2a.I1 2a.I2 2a.X 2b.I1 2b.I2 2b.X 2c.I1 2c.I2 2c.X 3a.I1 3a.I2 3a.X 4a.I1 4a.I2 4a.X 4b.I1 4b.I2 4b.X 4c.I1 4c.I2 4c.X 4d.I1 4d.I2 4d.X 4e.I1 4e.I2 4e.X 5a.I1 5a.I2 5a.X 5b.I1 5b.I2 5b.X 5c.I1 5c.I2 5c.X 5d.I1 5d.I2 5d.X 5e.I1 5e.I2 5e.X 5f.I1 5f.I2 5f.X 5g.I1 5g.I2 5g.X 5h.I1 5h.I2 5h.X 5i.I1 5i.I2 5i.X 5j.I1 5j.I2 5j.X 5k.I1 5k.I2 5k.X 5l.I1 5l.I2 5l.X 5m.I1 5m.I2 5m.X 6a.I1 6a.I2 6a.X 6b.I1 6b.I2 6b.X 6c.I1 6c.I2 6c.X 7a.I1 7a.I2 7a.X 8a.I1 8a.I2 8a.X 8b.I1 8b.I2 8b.X 9a.I1 9a.I2 9a.X
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index f626c384b..b47b5931b 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -89,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 EXTRA_DIST = $(TESTS)
 
 TESTS_ENVIRONMENT =    top_srcdir=$(top_srcdir)   srcdir=$(srcdir)   PERL="@PERL@"   PATH=../../src:$$PATH   PROG='md5sum --text'
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index 80b0f3986..9521a9da0 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -78,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -88,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 x = pr
 explicit = 0F 0FF 0FFnt 0FFt 0FnFnt 0FnFt 0Fnt 0Ft 3-0F 3-5l17f-t 3-FF 3a2l17-FF 3a3f-0F 3a3l15-t 3a3l8f-t 3b2l17-FF 3b3f-0F 3b3f-0FF 3b3f-FF 3b3l15-t 3b3l8f-t 3f-0F 3f-FF 3l17f-t 3l24-t 3ml17f-t 3ml24-FF 3ml24-t 3ml24-t-FF 4-7l24-FF 4l24-FF FF FFn FFtn FnFn a2l15-FF a2l17-FF a3-0F a3f-0F a3f-0FF a3f-FF a3l15-t a3l17f-lm a3l8f-t b2l15-FF b2l17-FF b3-0F b3f-0F b3f-0FF b3f-FF b3l15-t b3l17f-lm b3l8f-t ja3l17f-lm jb3l17f-lm jml17f-lm-lo l17f-t l24-FF l24-t loli ml17f-0F ml17f-lm-lo ml17f-t ml17f-t-0F ml20-FF-t ml24-FF ml24-t ml24-t-FF n+2-5l17f-0FF n+2l17f-0FF n+2l17f-bl n+3-7l24-FF n+3l17f-0FF n+3l17f-bl n+3ml13f-bl-FF n+3ml17f-bl-tn n+3ml17f-tn-bl n+4-8a2l17-FF n+4b2l10f-0FF n+5-8b3l10f-FF n+5a3l6f-0FF n+6a2l17-FF n+6b3l6f-FF n+7l24-FF n+8l20-FF nN1+3l17f-bl nN15l17f-bl njml17f-lmlmlo njml17f-lmlolm nl17f-bl nsml13-bl-FF nsml13-t-t-FF nsml13-t-tFFFF nsml17-bl-FF nsml17-t-t-FF nsml17-t-tFFFF o3a3l17f-tn o3a3sl17f-tn o3a3snl17f-tn o3b3l17f-tn o3b3sl17f-tn o3b3snl17f-tn o3jml17f-lm-lo o3ml17f-bl-tn o3msl17f-bl-tn o3msnl17fbltn t-0FF t-FF t-bl t-t tFFn tFFt tFFt-bl tFFt-lm tFnFt ta3-0FF ta3-FF tb3-0FF tb3-FF tn tt-0FF tt-FF tt-bl tt-t tta3-0FF tta3-FF ttb3-0FF ttb3-FF w20l17f-lm w25l17f-lm w26l17f-lm w35a3l17f-lm w35b3l17f-lm w35ja3l17f-lm w35jb3l17f-lm w35jml17f-lmlo w35ml17f-lm-lo w48l17f-lm w72j-0FF
 
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 62d3b4655..1db682e9b 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -78,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -88,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 x = sort
 explicit = 
 maint_gen = n1.I n1.X n2.I n2.X n3.I n3.X n4.I n4.X n5.I n5.X n6.I n6.X n7.I n7.X n8a.I n8a.X n8b.I n8b.X n9a.I n9a.X n9b.I n9b.X n10a.I n10a.X n10b.I n10b.X n11a.I n11a.X n11b.I n11b.X 01a.I 01a.X 02a.I 02a.X 02b.I 02b.X 02c.I 02c.X 02d.I 02d.X 02e.I 02e.X 02f.I 02f.X 03a.I 03a.X 03b.I 03b.X 03c.I 03c.X 03d.I 03d.X 03e.I 03e.X 03f.I 03f.X 03g.I 03g.X 03h.I 03h.X 03i.I 03i.X 04a.I 04a.X 04b.I 04b.X 04c.I 04c.X 04d.I 04d.X 04e.I 04e.X 05a.I 05a.X 05b.I 05b.X 05c.I 05c.X 05d.I 05d.X 05e.I 05e.X 05f.I 05f.X 06a.I 06a.X 06b.I 06b.X 06c.I 06c.X 06d.I 06d.X 06e.I 06e.X 06f.I 06f.X 07a.I 07a.X 07b.I 07b.X 07c.I 07c.X 07d.I 07d.X 08a.I 08a.X 08b.I 08b.X 09a.I 09a.X 09b.I 09b.X 09c.I 09c.X 09d.I 09d.X 10a.I 10a.X 10b.I 10b.X 10c.I 10c.X 10d.I 10d.X 10a0.I 10a0.X 10a1.I 10a1.X 10a2.I 10a2.X 10e.I 10e.X 10f.I 10f.X 10g.I 10g.X 11a.I 11a.X 11b.I 11b.X 11c.I 11c.X 11d.I 11d.X 12a.I 12a.X 12b.I 12b.X 12c.I 12c.X 12d.I 12d.X 13a.I 13a.X 13b.I 13b.X 14a.I 14a.X 14b.I 14b.X 15a.I 15a.X 15b.I 15b.X 15c.I 15c.X 15d.I 15d.X 15e.I 15e.X 16a.I 16a.X 17.I 17.X 18a.I 18a.X 18b.I 18b.X 18c.I 18c.X 18d.I 18d.X 18e.I 18e.X 19a.I 19a.X 19b.I 19b.X 20a.I 20a.X 21a.I 21a.X 21b.I 21b.X 21c.I 21c.X 21d.I 21d.X 21e.I 21e.X 21f.I 21f.X 21g.I 21g.X 22a.I 22a.X 22b.I 22b.X no-file1.X o-no-file1.X
diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index a83529f0e..f0b042dc3 100644
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -78,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -88,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 x = tac
 explicit = 
 maint_gen = basic-0.I basic-0.X basic-a.I basic-a.X basic-b.I basic-b.X basic-c.I basic-c.X basic-d.I basic-d.X basic-e.I basic-e.X basic-f.I basic-f.X basic-g.I basic-g.X basic-h.I basic-h.X basic-i.I basic-i.X basic-j.I basic-j.X basic-k.I basic-k.X b2-e.I b2-e.X b2-f.I b2-f.X b2-g.I b2-g.X b2-h.I b2-h.X b2-i.I b2-i.X b2-j.I b2-j.X b2-k.I b2-k.X opt-b.I opt-b.X opt-s.I opt-s.X opt-sb.I opt-sb.X opt-r.I opt-r.X opt-r2.I opt-r2.X opt-br.I opt-br.X opt-br2.I opt-br2.X
diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index 52c222421..5b53ded92 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -78,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -88,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 x = tail
 explicit = 
 maint_gen = obs-c1.I obs-c1.X obs-c2.I obs-c2.X obs-c3.I obs-c3.X obs-c4.I obs-c4.X obs-c5.I obs-c5.X obs-l1.I obs-l1.X obs-l2.I obs-l2.X obs-l3.I obs-l3.X obs-l4.I obs-l4.X obs-l5.I obs-l5.X obs-1.I obs-1.X obs-2.I obs-2.X obs-3.I obs-3.X obs-4.I obs-4.X obs-5.I obs-5.X obsx-1.I obsx-1.X obsx-2.I obsx-2.X obs-l.I obs-l.X err-1.I err-1.X err-2.I err-2.X err-3.I err-3.X err-4.I err-4.X err-5.I err-5.X err-6.I err-6.X minus-1.I minus-1.X minus-2.I minus-2.X n-1.I n-1.X n-2.I n-2.X n-3.I n-3.X n-4.I n-4.X n-4a.I n-4a.X n-5.I n-5.X n-5a.I n-5a.X n-5b.I n-5b.X
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index 8bc272117..6ee5066b0 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -78,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -88,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 x = tr
 explicit = 
 maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X 8.I 8.X 9.I 9.X a.I a.X b.I b.X c.I c.X d.I d.X e.I e.X f.I f.X g.I g.X h.I h.X i.I i.X j.I j.X k.I k.X l.I l.X m.I m.X n.I n.X o.I o.X p.I p.X q.I q.X r.I r.X s.I s.X t.I t.X u.I u.X v.I v.X w.I w.X x.I x.X y.I y.X z.I z.X range-a-a.I range-a-a.X null.I null.X upcase.I upcase.X dncase.I dncase.X rep-cclass.I rep-cclass.X rep-1.I rep-1.X rep-2.I rep-2.X rep-3.I rep-3.X esc.I esc.X ross-0a.I ross-0a.X ross-0b.I ross-0b.X ross-1a.I ross-1a.X ross-1b.I ross-1b.X ross-2.I ross-2.X ross-3.I ross-3.X ross-4.I ross-4.X ross-5.I ross-5.X ross-6.I ross-6.X
diff --git a/tests/uniq/Makefile.in b/tests/uniq/Makefile.in
index b5dd3e505..f1bb6eab9 100644
--- a/tests/uniq/Makefile.in
+++ b/tests/uniq/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -78,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -88,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 x = uniq
 explicit = 
 maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X 8.I 8.X 9.I 9.X 10.I 10.X 11.I 11.X 12.I 12.X 13.I 13.X 20.I 20.X 21.I 21.X 22.I 22.X 23.I 23.X 30.I 30.X 31.I 31.X 32.I 32.X 33.I 33.X 34.I 34.X 35.I 35.X 42.I 42.X 43.I 43.X 50.I 50.X 51.I 51.X 52.I 52.X 53.I 53.X 60.I 60.X 61.I 61.X 62.I 62.X 63.I 63.X 64.I 64.X 65.I 65.X 90.I 90.X 91.I 91.X 92.I 92.X 93.I 93.X 94.I 94.X 101.I 101.X 102.I 102.X 110.I 110.X 111.I 111.X 112.I 112.X
diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in
index f628ae0da..b9c8f92e5 100644
--- a/tests/wc/Makefile.in
+++ b/tests/wc/Makefile.in
@@ -10,7 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -78,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -88,6 +88,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
+
 x = wc
 explicit = 
 maint_gen = a0.I a0.X a1.I a1.X a2.I a2.X a3.I a3.X a4.I a4.X a5.I a5.X a6.I a6.X a7.I a7.X a8.I a8.X a9.I a9.X b0.I b0.X b1.I b1.X c0.I c0.X c1.I c1.X c2.I c2.X