Hi Gary, hope you won't mind few nits from an outsider ...
On Tuesday 01 November 2011, Gary V wrote:
>
> diff --git a/Makefile.am b/Makefile.am
> index d4e25cc..db98870 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -343,9 +343,9 @@ $(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4)
> # Don't let unused scripts leak into the libltdl Makefile
> $(stamp_mk): $(lt_Makefile_in)
> $(AM_V_at)T='$(ltdl_dir)/Makefile.tmp'; \
> - for p in $(ltdl_dir)/config/*; do \
> + for p in $(srcdir)/build-aux/*; do \
> test -f "$$p" || continue; \
> - f=`echo "$$p" | $(SED) 's,^$(ltdl_dir)/,,'`; \
> + f=`echo "$$p" | $(SED) 's,^$(srcdir)/,,'`; \
> case " $(pkgaux_scripts) " in \
> *" $$f "*) ;; \
> *) '$(SED)' \
> @@ -435,34 +435,42 @@ $(libtoolize_1): $(libtoolize_in)
>
> # The timestamps on these files must be preserved carefully so we install,
> # uninstall and set executable with custom rules here.
> -auxfiles = $(pkgaux_scripts) config/ltmain.sh
> +auxdest = build-aux
> +auxfiles = $(pkgaux_scripts) $(auxdest)/ltmain.sh
>
> # Everything that gets picked up by aclocal is automatically distributed,
> # this is the list of macro files we install on the user's system.
> -aclocalfiles = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 m4/ltoptions.m4 \
> - m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4
> +macrodest = m4
> +aclocalfiles = $(macrodest)/argz.m4 \
> + $(macrodest)/libtool.m4 \
> + $(macrodest)/ltdl.m4 \
> + $(macrodest)/ltoptions.m4 \
> + $(macrodest)/ltsugar.m4 \
> + $(macrodest)/ltversion.m4 \
> + $(macrodest)/lt~obsolete.m4
>
Shouldn't this better be done in either a preparatory or follow-up patch?
Ditto for other similar changes.
> diff --git a/bootstrap.conf b/bootstrap.conf
> index 116023c..2909d30 100644
> --- a/bootstrap.conf
> +++ b/bootstrap.conf
> @@ -344,6 +344,38 @@ libtool_build_prerequisites ()
> func_add_hook func_gnulib_tool libtool_build_prerequisites
>
>
> +# libtool_link_libltdl_subdirs
> +# ----------------------------
> +# In order to autoreconf libltdl, we need some additional directories
> +# from the top level directory.
> +libtool_link_libltdl_subdirs ()
> +{
>
> [SNIP]
>
> + # Link only the scripts required by libltdl.
> + mkdir "libltdl/$build_aux"
> + for my_file in $my_pkgaux_files; do
> + ln -s "../../$my_file" "libltdl/$my_file"
>
Is `ln -s' portable to e.g., MinGW? Or is the bootstrapping process
not meant to work there anyway, so we can just not care?
Regards,
Stefano
