* automake.texi (Dist): Document $(DISTCHECK_CONFIGURE_FLAGS).

* lib/am/distdir.am (distcheck): Honnor $(DISTCHECK_CONFIGURE_FLAGS).
Suggested by Merijn de Jonge.

diff --git a/ChangeLog b/ChangeLog
index 96a7c68c3f17eb11570bf2b6083bd293449ef9c5..6a15500ae08bd212e8babafb77fe4ddf09243b1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-05  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.texi (Dist): Document $(DISTCHECK_CONFIGURE_FLAGS).
+       * lib/am/distdir.am (distcheck): Honnor $(DISTCHECK_CONFIGURE_FLAGS).
+       Suggested by Merijn de Jonge.
+
 2001-12-05  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * lib/am/tags.am (ID): Search $(LISP) files in $(srcdir),

diff --git a/NEWS b/NEWS
index 9bf39528886c3e383120550a335834119352f1cc..61cdaa4e109490c48bdf258bfbb1596db87bf34b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ New in 1.5a:
 * The part of the distcheck target that checks whether distclean actually
   cleans all built files has been moved in a separate target, distcleancheck,
   so it can be overridden easily.
+* `make distcheck' will pass additional options defined in
+  $(DISTCHECK_CONFIGURE_FLAGS) to configure.
 * Fixed CDPATH portability problems, in particular for MacOS X.
 * Fixed handling of nobase_ targets.
 * Fixed support of implicit rules leading to .lo objects.

diff --git a/THANKS b/THANKS
index e96102546201fdbadb50b2c350127293fc78b3b2..61d117152adf17590a9124f5042375055f932e0b 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -104,6 +104,7 @@ Matt Leach          mleach@cygnus.com
 Matthew D. Langston    langston@SLAC.Stanford.EDU
 Matthias Clasen                clasen@mathematik.uni-freiburg.de
 Maxim Sinev            good@goods.ru
+Merijn de Jonge                M.de.Jonge@cwi.nl
 Michael Brantley       Michael-Brantley@deshaw.com
 Michel de Ruiter       mdruiter@cs.vu.nl
 Miles Bader            miles@ccs.mt.nec.co.jp

diff --git a/automake.texi b/automake.texi
index 1682e9e82d71bb47ec0820c27e518028f696a428..90a2f895b6505955a78e277342f769bc58c8404c 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1627,7 +1627,7 @@ will automatically run @code{aclocal}, you need a way to specify these
 arguments.  You can do this by defining @code{ACLOCAL_AMFLAGS}; this
 holds arguments which are passed verbatim to @code{aclocal}.  This macro
 is only useful in the top-level @file{Makefile.am}.
-@cindex ACLOCAL_AMFLAGS
+@vindex ACLOCAL_AMFLAGS
 
 
 @node Programs, Other objects, Rebuilding, Top
@@ -3685,10 +3685,17 @@ dist-hook:
 
 Automake also generates a @code{distcheck} target which can be of help
 to ensure that a given distribution will actually work.
-@code{distcheck} makes a distribution, and then tries to do a
-@code{VPATH} build.
+@code{distcheck} makes a distribution, then tries to do a @code{VPATH}
+build, run the testsuite, and finally make another tarfile to ensure the
+distribution is self-contained.
 @trindex distcheck
 
+Building the package involves running @code{./configure}.  If you need
+to supply additional flags to @code{configure}, define them in the
+@code{DISTCHECK_CONFIGURE_FLAGS} variable, either in your top-level
+@file{Makefile.am}, or on the commande line when invoking @code{make}.
+@vindex DISTCHECK_CONFIGURE_FLAGS
+
 If the target @code{distcheck-hook} is defined in your
 @file{Makefile.am}, then it will be invoked by @code{distcheck} after
 the new distribution has been unpacked, but before the unpacked copy is
@@ -3705,6 +3712,7 @@ the @code{VPATH} build.  By default, @code{distcleancheck} will run
 running @code{$(distcleancheck_listfiles)}.  Usually this check will
 find generated files that you forgot to add to the @code{DISTCLEANFILES}
 variable (@pxref{Clean}).
+@trindex distcleancheck
 
 The @code{distcleancheck} behaviour should be ok for most packages,
 otherwise you have the possibility to override the definitition of
@@ -3712,6 +3720,7 @@ either the @code{distcleancheck} target, or the
 @code{$(distcleancheck_listfiles)} variable.  For instance to disable
 @code{distcleancheck} completely, add the following rule to your
 top-level @file{Makefile.am}:
+@vindex distcleancheck_listfiles
 
 @example
 distcleancheck:

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index f578f491b095101c944c1503d5bb0560ffb51c20..854164f2c654e229344363b2666acacf7f717b80 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -261,6 +261,9 @@ distcheck: dist
          && cd $(distdir)/=build \
          && ../configure --srcdir=.. --prefix=$$dc_install_base \
 ?GETTEXT?          --with-included-gettext \
+## Additional flags for configure.  Keep this last in the configure
+## invocation so the user can override previous options.
+           $(DISTCHECK_CONFIGURE_FLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
          && $(MAKE) $(AM_MAKEFLAGS) check \

diff --git a/stamp-vti b/stamp-vti
index fff80e83c97afdc153c4b0519bedb651e7af1ffd..e7ee0954c7887e105b7c61679308595271407282 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 26 November 2001
-@set UPDATED-MONTH November 2001
+@set UPDATED 5 December 2001
+@set UPDATED-MONTH December 2001
 @set EDITION 1.5a
 @set VERSION 1.5a

diff --git a/version.texi b/version.texi
index fff80e83c97afdc153c4b0519bedb651e7af1ffd..e7ee0954c7887e105b7c61679308595271407282 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 26 November 2001
-@set UPDATED-MONTH November 2001
+@set UPDATED 5 December 2001
+@set UPDATED-MONTH December 2001
 @set EDITION 1.5a
 @set VERSION 1.5a