Re: branch-1_4 - provide a man page

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

> 
> 2006-06-07  Eric Blake  <ebb9 <at> byu.net>
> 
>       Distribute a rudimentary man page.
>       * Makefile.am (SUBDIRS): Move doc after src so that 'm4 --help'
>       can feed help2man.
>       * doc/Makefile.am (man_MANS, EXTRA_DIST, MAINTAINERDISTCLEAN),
>       (SUFFIXES, m4.1): New macros and rules to build m4.1.

And I botched it.  It is spelled MAINTAINERCLEANFILES in automake.

Also in this fix: a modifier order cleanup, plus a fix to allow bootstrapping 
with autoconf 2.59 and m4 configured with --enable-changeword (I also posted a 
patch so that autoconf 2.60 will not have the same problem, but I don't want to 
make bootstrapping m4 depend on an unreleased autoconf: 
http://www.nabble.com/squelch-changeword-builtin-t1748693.html#a4753869).

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

        * lib/regex.c (bcmp_translate): Canonicalize type name.
        * doc/Makefile.am (MAINTAINERCLEANFILES): Fix typo.
        * configure.ac (changeword): Disable changeword for the creation
        of configure, in case of bootstrapping with an m4 configured with
        --enable-changeword.

Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.36.2.9
diff -u -r1.36.2.9 configure.ac
--- configure.ac        29 May 2006 19:40:03 -0000      1.36.2.9
+++ configure.ac        7 Jun 2006 17:06:18 -0000
@@ -99,6 +99,10 @@
   ])
 fi
 
+dnl Don't let changeword get in our way, if bootstrapping with a version of
+dnl m4 that already turned the feature on.
+m4_undefine([changeword])dnl
+
 AC_MSG_CHECKING([[if changeword is wanted]])
 AC_ARG_ENABLE([changeword],
   [AS_HELP_STRING([--enable-changeword],
Index: doc/Makefile.am
===================================================================
RCS file: /sources/m4/m4/doc/Attic/Makefile.am,v
retrieving revision 1.8.2.2
diff -u -r1.8.2.2 Makefile.am
--- doc/Makefile.am     7 Jun 2006 12:13:08 -0000       1.8.2.2
+++ doc/Makefile.am     7 Jun 2006 17:06:18 -0000
@@ -22,7 +22,7 @@
 info_TEXINFOS = m4.texinfo
 man_MANS = m4.1
 EXTRA_DIST = $(man_MANS)
-MAINTAINERDISTCLEAN = $(man_MANS)
+MAINTAINERCLEANFILES = $(man_MANS)
 SUFFIXES = .1
 
 # Depend on configure.ac for version, m4.c for usage text.  Do not depend on
Index: lib/regex.c
===================================================================
RCS file: /sources/m4/m4/lib/Attic/regex.c,v
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.5 regex.c
--- lib/regex.c 7 Jun 2006 03:54:09 -0000       1.1.1.1.2.5
+++ lib/regex.c 7 Jun 2006 17:06:18 -0000
@@ -4890,7 +4890,7 @@
 
 static int
 bcmp_translate (s1, s2, len, translate)
-     unsigned const char *s1, *s2;
+     const unsigned char *s1, *s2;
      register int len;
      char *translate;
 {