On Fri, Sep 14, 2012 at 09:45:54AM +0200, Michel Dänzer wrote: > On Fre, 2012-09-14 at 09:22 +0200, Thierry Reding wrote: > > When running the configure script from autogen.sh, enable the maintainer > > mode by passing --enable-maintainer-mode. This activates some rules to > > regenerate autotools files automatically. > > --- > > autogen.sh | 2 +- > > configure.ac | 1 + > > 2 files changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/autogen.sh b/autogen.sh > > index 626d213..9d3fb60 100755 > > --- a/autogen.sh > > +++ b/autogen.sh > > @@ -10,5 +10,5 @@ autoreconf -v --install || exit 1 > > cd $ORIGDIR || exit $? > > > > if test -z "$NOCONFIGURE"; then > > - "$srcdir"/configure "$@" > > + "$srcdir"/configure "$@" --enable-maintainer-mode > > fi > > diff --git a/configure.ac b/configure.ac > > index 184d1ed..1451e83 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -12,6 +12,7 @@ AC_CONFIG_AUX_DIR([bin]) > > AC_CONFIG_MACRO_DIR([m4]) > > AC_CANONICAL_SYSTEM > > AM_INIT_AUTOMAKE([foreign]) > > +AM_MAINTAINER_MODE > > AFAIK AM_MAINTAINER_MODE disables those rules by default in the first > place, requiring --enable-maintainer-mode to be passed to configure to > enable them again. AFAIR this is to avoid the rules triggering > spuriously from disted tarball trees. Is that still an issue these days? > If so, the change is probably fine, as it's what most autotools projects > seem to do. But the commit message is slightly misleading.
You're right, the commit message could be a bit more explicit. How about something like this: build: Add support for maintainer mode The maintainer mode can be used to activate some rules that regenerate autotools files automatically. It is useful for developers working on Mesa because automatically takes care of for example regenerating Makefile.in and Makefile from a modified Makefile.am. The configure script is also one of the files that is automatically recreated and re- run if configure.ac is modified. By default, the maintainer mode is disabled. It can be enabled with the --enable-maintainer-mode configure script option. This commit updates the autogen.sh script to enable maintainer mode by default when bootstrapping from a git clone. Thierry
pgprZtw5Gx04W.pgp
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev