FYI: Make distcheck

[Akim Demaille]

There is still the problem of obstack.h, which I don't know how to
solve properly.  The problem now is that Automake encodes a dependency
on `obstack.h' (no path) in m4/Makefile, and in case of separate
builds, of course this file is not present.

Still, the patch below improves the situation.

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        Improve `make distcheck'.

        * configure.in: Be sure to be able to run `mkconfig.sh' when src
        != build.
        * Makefile.am (dist-hook): Remove, as it is no longer needed.
        * doc/m4.texinfo (Include): Add missing blank.
        * m4/Makefile.am (EXTRA_DIST): Distribute gnu-obstack.h and
        obstack.c.

Index: Makefile.am
===================================================================
RCS file: /cvs/m4/Makefile.am,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile.am
--- Makefile.am 2001/08/07 10:02:25 1.5
+++ Makefile.am 2001/08/07 12:51:21
@@ -41,12 +41,6 @@
 
 CVS    = cvs # set it to `:' to avoid CVS operations at dist time
 
-dist-hook:
-       (cd $(distdir) && mkdir $(auxdir))
-       for file in $(AUX_DIST) $(AUX_DIST_EXTRA); do \
-         cp $$file $(distdir)/$$file; \
-       done
-
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
 cvs-dist: distcheck # maintainer-check
Index: configure.in
===================================================================
RCS file: /cvs/m4/configure.in,v
retrieving revision 1.9
diff -u -u -r1.9 configure.in
--- configure.in 2001/08/07 10:23:50 1.9
+++ configure.in 2001/08/07 12:51:21
@@ -154,6 +154,9 @@
 
 AC_SUBST(ac_aux_dir)
 
+# Big hack below: 2.13 does not garantee the value of $srcdir, so
+# do not use `sh $srcdir/tests/mkconfig.sh' since in case we build
+# in a separate dir, it points to srcdir for... `examples/'!
 AC_OUTPUT(
 Makefile
 config/Makefile
@@ -166,5 +169,6 @@
 tests/Makefile
 examples/Makefile,
 [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; \
-sh $srcdir/tests/mkconfig.sh; \
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in])
+sh $m4_top_srcdir/tests/mkconfig.sh; \
+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h.in],
+[m4_top_srcdir=$srcdir])
Index: config/gnu-obstack.m4
===================================================================
RCS file: /cvs/m4/config/gnu-obstack.m4,v
retrieving revision 1.1
diff -u -u -r1.1 gnu-obstack.m4
--- config/gnu-obstack.m4 2001/08/07 10:23:50 1.1
+++ config/gnu-obstack.m4 2001/08/07 12:51:21
@@ -1,5 +1,5 @@
 #                                                            -*- Autoconf -*-
-# gnu-obstacks.m4 -- the libc supplied version of obstacks if available
+# gnu-obstack.m4 -- the libc supplied version of obstacks if available.
 #
 # Copyright 2000, 2001 Gary V. Vaughan <address@hidden>
 #
Index: doc/m4.texinfo
===================================================================
RCS file: /cvs/m4/doc/m4.texinfo,v
retrieving revision 1.3
diff -u -u -r1.3 m4.texinfo
--- doc/m4.texinfo 2000/12/01 01:22:41 1.3
+++ doc/m4.texinfo 2001/08/07 12:51:21
@@ -1242,7 +1242,7 @@
 It is possible to rename an already defined macro.  To do this, you need
 the builtin @code{defn}, which expands to the @emph{quoted definition}
 of @var{name}.  If the argument is not a defined macro, the expansion is
-void. 
+void.
 
 If @var{name} is a builtin, the expansion is a special token, which
 points to the builtin's internal definition.  This token is only
@@ -1385,7 +1385,7 @@
 @end deffn
 
 This can be used to call macros with computed or with ``illegal'' names
-(@code{define} allows such names to be defined): 
+(@code{define} allows such names to be defined):
 
 @example
 define(`$$internal$macro', `Internal macro (name `$0')')
@@ -2469,7 +2469,7 @@
 @section Including named files
 
 @deffn {Builtin (m4)} include (@var{filename})
address@hidden {Builtin (m4)} sinclude(@var{filename})
address@hidden {Builtin (m4)} sinclude (@var{filename})
 These two builtin macros are for including files.  Both cause the file
 named @var{filename} to be read by @code{m4}.  When the end of the file
 is reached, input is resumed from the previous input file.
@@ -3476,7 +3476,7 @@
 string @var{template}, which should end with the string @samp{XXXXXX}.
 The six @code{X}'s are then replaced, usually with something that
 includes the process id of the @code{m4} process, in order to make the
-file name unique. 
+file name unique.
 
 The builtin macro @code{maketemp} is recognized only when given
 arguments.
Index: m4/Makefile.am
===================================================================
RCS file: /cvs/m4/m4/Makefile.am,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile.am
--- m4/Makefile.am 2000/11/29 23:26:08 1.6
+++ m4/Makefile.am 2001/08/07 12:51:21
@@ -1,17 +1,17 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 ##
-## Copyright 2000 Free Software Foundation
-## 
+## Copyright 2000, 2001 Free Software Foundation
+##
 ## 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
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
-## 
+##
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; see the file COPYING.  If not, write to
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -30,6 +30,8 @@
 noinst_HEADERS = m4private.h
 pkginc_HEADERS = error.h list.h ltdl.h regex.h system.h @OBSTACK_H@
 EXTRA_HEADERS  = gnu-obstack.h
+
+EXTRA_DIST = $(EXTRA_HEADERS) obstack.c
 
 lib_LTLIBRARIES                = libm4.la
 libm4_la_SOURCES       = builtin.c debug.c error.c eval.c \