Hi Sylvain,
> > - 'm4/gnulib-comp.m4' is "meant to be stored in CVS", however it is
> > not included in tarballs on 'make dist'. Currently my 'bootstrap'
> > script just calls 'gnulib-tool --import' and rely on
> > 'gnulib-comp.m4' to fetch to appropriate modules. People who
> > download a project tarball and want to refresh the autotools files
> > will want to run 'bootstrap', which will only import the 'dummy'
> > module in this case.
>
> At second glance, 'gnulib-tool --import' won't automatically detect
> modules in a fresh Git checkout even when 'gnulib-comp.m4' is present.
The file that is meant to be stored in VCS and that will allow
'gnulib-tool --import' to work properly in fresh checkouts is gnulib-cache.m4,
not gnulib-comp.m4.
I'm changing gnulib-tool so that it emits a reminder about this.
Thank you for reporting this: I have the same problem also in the GNU gettext
CVS
for a long time, and this patch will hopefully fix it.
> Do you manually specify the modules to import in your 'bootstrap'
> scripts?
Some projects do this; others only use "gnulib --update" in the autogen.sh or
bootstrap script.
Bruno
2008-06-29 Bruno Haible <[EMAIL PROTECTED]>
* gnulib-tool (func_import): Recommend to put gnulib-cache.m4 into
EXTRA_DIST.
Reported by Sylvain Beucler <[EMAIL PROTECTED]>.
*** gnulib-tool.orig 2008-06-30 00:59:50.000000000 +0200
--- gnulib-tool 2008-06-30 00:49:42.000000000 +0200
***************
*** 3409,3414 ****
--- 3409,3426 ----
fi
fi
echo " - mention \"-I ${m4base}\" in ACLOCAL_AMFLAGS in Makefile.am,"
+ {
+ # Find the first parent directory of $m4base that contains a Makefile.am.
+ sed_last='s,^.*/\([^/][^/]*\)//*$,\1/,
+ s,//*$,/,'
+ sed_butlast='s,[^/][^/]*//*$,,'
+ dir1="${m4base}/"; dir2=""
+ while test -n "$dir1" && test ! -f "${destdir}/${dir1}Makefile.am"; do
+ dir2=`echo "$dir1" | sed -e "$sed_last"`"$dir2"
+ dir1=`echo "$dir1" | sed -e "$sed_butlast"`
+ done
+ echo " - mention ${dir2}gnulib-cache.m4 in EXTRA_DIST in
${dir1}Makefile.am."
+ }
echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after
AC_PROG_CC,"
echo " - invoke ${macro_prefix}_INIT in $configure_ac."
}
