[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
configure-amflags.patch
From: |
Alexandre Duret-Lutz |
Subject: |
configure-amflags.patch |
Date: |
04 Dec 2001 22:34:29 +0100 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) Emacs/20.7 |
`CONFIGURE_AMFLAGS' relates to configure like `ACLOCAL_AMFLAGS'
does to aclocal. Does that sounds ok?
Index: ChangeLog
--- ChangeLog
+++ ChangeLog
@@ -1,1 +1,7 @@
+2001-12-04 Alexandre Duret-Lutz <address@hidden>
+
+ * automake.texi (Dist): Document $(CONFIGURE_AMFLAGS).
+ * lib/am/distdir.am (distcheck): Honnor $(CONFIGURE_AMFLAGS).
+ Suggested by Merijn de Jonge.
+
Index: NEWS
===================================================================
RCS file: /home/adl/CVSROOT/automake-20011201-2207/NEWS,v
retrieving revision 1.1
diff -u -r1.1 NEWS
--- NEWS 1 Dec 2001 21:07:42 -0000 1.1
+++ NEWS 4 Dec 2001 21:15:45 -0000
@@ -13,6 +13,8 @@
* 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 $(CONFIGURE_AMFLAGS)
+ 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.
Index: automake.texi
===================================================================
RCS file: /home/adl/CVSROOT/automake-20011201-2207/automake.texi,v
retrieving revision 1.2
diff -u -r1.2 automake.texi
--- automake.texi 1 Dec 2001 21:52:14 -0000 1.2
+++ automake.texi 4 Dec 2001 20:03:59 -0000
@@ -1627,7 +1627,7 @@
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}.
address@hidden ACLOCAL_AMFLAGS
address@hidden ACLOCAL_AMFLAGS
@node Programs, Other objects, Rebuilding, Top
@@ -3685,10 +3685,17 @@
Automake also generates a @code{distcheck} target which can be of help
to ensure that a given distribution will actually work.
address@hidden makes a distribution, and then tries to do a
address@hidden build.
address@hidden 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
address@hidden variable, either in your top-level
address@hidden, or on the commande line when invoking @code{make}.
address@hidden CONFIGURE_AMFLAGS
+
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 @@
running @code{$(distcleancheck_listfiles)}. Usually this check will
find generated files that you forgot to add to the @code{DISTCLEANFILES}
variable (@pxref{Clean}).
address@hidden 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 @@
@code{$(distcleancheck_listfiles)} variable. For instance to disable
@code{distcleancheck} completely, add the following rule to your
top-level @file{Makefile.am}:
address@hidden distcleancheck_listfiles
@example
distcleancheck:
Index: lib/am/distdir.am
===================================================================
RCS file: /home/adl/CVSROOT/automake-20011201-2207/lib/am/distdir.am,v
retrieving revision 1.1
diff -u -r1.1 distdir.am
--- lib/am/distdir.am 1 Dec 2001 21:07:42 -0000 1.1
+++ lib/am/distdir.am 4 Dec 2001 19:29:00 -0000
@@ -261,6 +261,9 @@
&& 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.
+ $(CONFIGURE_AMFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
--
Alexandre Duret-Lutz
- configure-amflags.patch,
Alexandre Duret-Lutz <=