branch-1_4 Solaris cleanup

[Eric Blake]

I tried a VPATH build on Solaris 8, and needed the following cleanups:

2006-07-03  Eric Blake  <address@hidden>

        * checks/check-them: Use portable = in test.
        * src/Makefile.am (AM_CPPFLAGS): Omit space between -I and
        directory, as required by Solaris cc.  Include built headers, as
        required by Solaris make in VPATH build.
        * checks/Makefile.in: Use $(srcdir) where needed.
        (CHECKS): Factor $(srcdir) into macro.
        (DISTFILES): Likewise.  Automake takes care of distributing
        Makefile.in.
        (dist): Simplify.
        (Makefile): Use modern syntax of config.status.
        * doc/m4.texinfo (Loops, Include, Undivert, Incompatibilities):
        Avoid overfull and underfull hboxes in dvi.

Index: checks/Makefile.in
===================================================================
RCS file: /sources/m4/m4/checks/Attic/Makefile.in,v
retrieving revision 1.1.1.1.2.9
diff -u -r1.1.1.1.2.9 Makefile.in
--- checks/Makefile.in  3 Jul 2006 13:16:18 -0000       1.1.1.1.2.9
+++ checks/Makefile.in  3 Jul 2006 16:44:13 -0000
@@ -32,13 +32,14 @@
 AWK = @AWK@
 
 # Vern says that the first star is required around an Alpha make bug.
-CHECKS = *[0-9][0-9].*
-DISTFILES = Makefile.in get-them check-them stamp-checks
+CHECKS = $(srcdir)/*[0-9][0-9].*
+# Makefile.in is automatically distributed by automake.
+DISTFILES = $(srcdir)/get-them $(srcdir)/check-them $(srcdir)/stamp-checks
 
-all: stamp-checks
+all: $(srcdir)/stamp-checks
 
-stamp-checks: get-them ../doc/m4.texinfo
-       rm -f $(srcdir)/$(CHECKS)
+$(srcdir)/stamp-checks: $(srcdir)/get-them $(srcdir)/../doc/m4.texinfo
+       rm -f $(CHECKS)
        cd $(srcdir) && AWK=$(AWK) ./get-them ../doc/m4.texinfo
        touch $(srcdir)/stamp-checks
 
@@ -49,13 +50,13 @@
 
 uninstall:
 
-check: stamp-checks
+check: $(srcdir)/stamp-checks
        PATH=`pwd`/../src"$(PATH_SEPARATOR)"$$PATH; export PATH; \
-       $(srcdir)/check-them -I $(srcdir)/../examples $(srcdir)/$(CHECKS)
+       $(srcdir)/check-them -I $(srcdir)/../examples $(CHECKS)
 
-installcheck: stamp-checks
+installcheck: $(srcdir)/stamp-checks
        PATH='$(bindir)'"$(PATH_SEPARATOR)"$$PATH; export PATH; \
-       $(srcdir)/check-them -I $(srcdir)/../examples $(srcdir)/$(CHECKS)
+       $(srcdir)/check-them -I $(srcdir)/../examples $(CHECKS)
 
 tags:
 
@@ -67,23 +68,19 @@
        rm -f Makefile
 
 maintainer-clean realclean: distclean
-       rm -f $(srcdir)/$(CHECKS) stamp-checks
+       rm -f $(CHECKS) $(srcdir)/stamp-checks
 
 distdir: dist
 
-dist: $(DISTFILES) stamp-checks
+dist: $(DISTFILES)
        @echo "Copying distribution files"
-       @for file in $(DISTFILES); do \
-         ln $(srcdir)/$$file ../$(PACKAGE)-$(VERSION)/checks 2> /dev/null \
-           || cp -p $(srcdir)/$$file ../$(PACKAGE)-$(VERSION)/checks; \
-       done
-       @for file in $(srcdir)/$(CHECKS); do \
-         ln $$file ../$(PACKAGE)-$(VERSION)/checks \
+       @for file in $(DISTFILES) $(CHECKS); do \
+         ln $$file ../$(PACKAGE)-$(VERSION)/checks 2> /dev/null \
            || cp -p $$file ../$(PACKAGE)-$(VERSION)/checks; \
        done
 
-Makefile: Makefile.in ../config.status
-       cd .. && CONFIG_FILES=checks/$@ CONFIG_HEADERS= ./config.status
+Makefile: $(srcdir)/Makefile.in ../config.status
+       cd .. && ./config.status checks/$@
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Index: checks/check-them
===================================================================
RCS file: /sources/m4/m4/checks/Attic/check-them,v
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.6 check-them
--- checks/check-them   3 Jul 2006 13:16:18 -0000       1.1.1.1.2.6
+++ checks/check-them   3 Jul 2006 16:44:13 -0000
@@ -44,7 +44,7 @@
   echo "Checking $file"
   LC_MESSAGES=C m4 -d -I "$examples" $file >$out 2>$err
 
-  if test $? == 77 ; then
+  if test $? = 77 ; then
     skipped="$skipped $file"
     continue
   fi
Index: doc/m4.texinfo
===================================================================
RCS file: /sources/m4/m4/doc/m4.texinfo,v
retrieving revision 1.1.1.1.2.30
diff -u -r1.1.1.1.2.30 m4.texinfo
--- doc/m4.texinfo      3 Jul 2006 13:16:18 -0000       1.1.1.1.2.30
+++ doc/m4.texinfo      3 Jul 2006 16:44:13 -0000
@@ -1646,12 +1646,12 @@
 @example
 include(`forloop.m4')
 @result{}
-forloop(`i', `1', `4', `forloop(`j', `1', `8', `(i, j) ')
+forloop(`i', `1', `4', `forloop(`j', `1', `8', ` (i, j)')
 ')
address@hidden(1, 1) (1, 2) (1, 3) (1, 4) (1, 5) (1, 6) (1, 7) (1, 8) @comment
address@hidden(2, 1) (2, 2) (2, 3) (2, 4) (2, 5) (2, 6) (2, 7) (2, 8) @comment
address@hidden(3, 1) (3, 2) (3, 3) (3, 4) (3, 5) (3, 6) (3, 7) (3, 8) @comment
address@hidden(4, 1) (4, 2) (4, 3) (4, 4) (4, 5) (4, 6) (4, 7) (4, 8) @comment
address@hidden (1, 1) (1, 2) (1, 3) (1, 4) (1, 5) (1, 6) (1, 7) (1, 8)
address@hidden (2, 1) (2, 2) (2, 3) (2, 4) (2, 5) (2, 6) (2, 7) (2, 8)
address@hidden (3, 1) (3, 2) (3, 3) (3, 4) (3, 5) (3, 6) (3, 7) (3, 8)
address@hidden (4, 1) (4, 2) (4, 3) (4, 4) (4, 5) (4, 6) (4, 7) (4, 8)
 @result{}
 @end example
 
@@ -1667,7 +1667,7 @@
 @pxref{Incr}), and recurses.
 
 Here is the actual implementation of @code{forloop}, distributed as
address@hidden/forloop.m4} in this package:
address@hidden/@/forloop.m4} in this package:
 
 @example
 undivert(`forloop.m4')
@@ -2372,7 +2372,7 @@
 
 The rest of this section assumes that @code{m4} is invoked with the
 @samp{-I} option pointing to the @file{examples} directory shipped as
-part of the GNU @code{m4} package.  The file @file{examples/incl.m4} in
+part of the GNU @code{m4} package.  The file @file{examples/@/incl.m4} in
 the distribution contains the lines:
 @comment ignore
 @example
@@ -2611,7 +2611,7 @@
 argument, the contents of the file named will be copied, uninterpreted, to
 the current output.  This complements the builtin @code{include}
 (@pxref{Include}).  To illustrate the difference, the file
address@hidden/foo} contains the word @samp{bar}:
address@hidden/@/foo} contains the word @samp{bar}:
 
 @example
 define(`bar', `BAR')
@@ -3877,7 +3877,7 @@
 processes all arguments, with output separated by spaces.
 
 However, it is possible to emulate @acronym{POSIX} behavior by
-including the file @file{examples/wrapfifo.m4} from the distribution:
+including the file @file{examples/@/wrapfifo.m4} from the distribution:
 
 @example
 undivert(`wrapfifo.m4')dnl
Index: src/Makefile.am
===================================================================
RCS file: /sources/m4/m4/src/Attic/Makefile.am,v
retrieving revision 1.18.2.1
diff -u -r1.18.2.1 Makefile.am
--- src/Makefile.am     29 May 2006 19:40:03 -0000      1.18.2.1
+++ src/Makefile.am     3 Jul 2006 16:44:13 -0000
@@ -19,7 +19,7 @@
 ##
 ## This file written by Eric Blake <address@hidden>
 
-AM_CPPFLAGS = -I $(top_srcdir)/lib
+AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib
 bin_PROGRAMS = m4
 m4_SOURCES = m4.h m4.c builtin.c debug.c eval.c format.c freeze.c input.c \
 macro.c output.c path.c symtab.c