Work around losing `awk'. Report from Harlan Stenn.

	* m4/init.m4 (AM_INIT_AUTOMAKE): Require AC_PROG_AWK.
	* tags.am (ID, TAGS): Use $(AWK), not `awk'.

diff --git a/ChangeLog b/ChangeLog
index 3679be9..e1e0e11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-07-13  Tom Tromey  <tromey@cygnus.com>
 
+       Work around losing `awk'.  Report from Harlan Stenn.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Require AC_PROG_AWK.
+       * tags.am (ID, TAGS): Use $(AWK), not `awk'.
+
        * automake.in (handle_source_transform): Mark prefix as seen if
        corresponding _SOURCES variable exists.  Fixes empty2.test.
 

diff --git a/lib/am/tags.am b/lib/am/tags.am
index 9f7f1f2..94db7f9 100644 (file)
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -24,7 +24,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 ## Handle VPATH correctly.
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         awk '    { files[$$0] = 1; } \
+         $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        mkid -f$$here/ID $$unique $(LISP)
 
@@ -44,7 +44,7 @@ SUBDIRS       done; \
 ## Handle VPATH correctly.
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         awk '    { files[$$0] = 1; } \
+         $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
 ## Make sure we have something to run etags on.
        test -z "$(ETAGS_ARGS)@CONFIG@$$unique$(LISP)$$tags" \

diff --git a/m4/init.m4 b/m4/init.m4
index e503e86..6ce9d65 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -40,6 +40,9 @@ dnl This is sad, since we only need this for "dist".  However,
 dnl there's no other good way to do it.  We prefer GNU tar if
 dnl we can find it.  If we can't find a tar, it doesn't really matter.
 AC_CHECK_PROGS(AMTAR, gnutar gtar tar)
+dnl We need awk for the "check" target.  The system "awk" is bad on
+dnl some platforms.
+AC_REQUIRE([AC_PROG_AWK])
 AMTARFLAGS=
 if test -n "$AMTAR"; then
   if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then

diff --git a/tags.am b/tags.am
index 9f7f1f2..94db7f9 100644 (file)
--- a/tags.am
+++ b/tags.am
@@ -24,7 +24,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 ## Handle VPATH correctly.
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         awk '    { files[$$0] = 1; } \
+         $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        mkid -f$$here/ID $$unique $(LISP)
 
@@ -44,7 +44,7 @@ SUBDIRS       done; \
 ## Handle VPATH correctly.
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         awk '    { files[$$0] = 1; } \
+         $(AWK) '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
 ## Make sure we have something to run etags on.
        test -z "$(ETAGS_ARGS)@CONFIG@$$unique$(LISP)$$tags" \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8576b01..df88623 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -153,6 +153,7 @@ dup2.test \
 else.test \
 empty.test \
 empty2.test \
+empty3.test \
 error.test \
 exdir.test \
 exdir2.test \