On Tuesday 01 November 2011, Gary V wrote: > Similarly to 1/3, full compressed patch attached. 72 hours etc etc. > > * bootstrap.conf (libtool_link_libltdl_subdirs): Add `m4'. > * cfg.mk (exclude_file_name_regexp--sc_prohibit_test_minus_ao): > Adjust path. > * configure.ac (AC_CONFIG_MACRO_DIR): Adjust. > * libltdl/m4: Moved to it's parent directory. > s/it's/its/.
> * tests/cdemo/Makefile.am, tests/demo/Makefile.am, > tests/depdemo/Makefile.am, tests/f77demo/Makefile.am, > tests/fcdemo/Makefile.am, tests/mdemo/Makefile.am, > tests/mdemo2/Makefile.am, tests/pdemo/Makefile.am, > tests/tagdemo/Makefile.am (ACLOCAL_AMFLAGS): Use new location > of macro_dir. > * libtoolize.m4sh: Ditto. > > diff --git a/bootstrap.conf b/bootstrap.conf > index 2909d30..ebdb293 100644 > --- a/bootstrap.conf > +++ b/bootstrap.conf > @@ -353,6 +353,7 @@ libtool_link_libltdl_subdirs () > $debug_cmd > > $require_build_aux > + $require_macro_dir > $require_pkgaux_scripts > > my_pkgaux_files="$pkgaux_scripts $build_aux/ltmain.sh" > @@ -372,6 +373,11 @@ libtool_link_libltdl_subdirs () > for my_file in $my_pkgaux_files; do > ln -s "../../$my_file" "libltdl/$my_file" > done > + > + # Macro directory is identical, so link the directory. > + func_verbose "creating libltdl/$macro_dir" > + rm -f "libltdl/$macro_dir" || exit 1 > + ln -s "../$macro_dir" "libltdl/$macro_dir" > } Same as before: is `ln -s' truly portable to e.g. MinGW? Should we care if the boostrapping process does not work there? > package_revision=`$SHELL $ac_aux_dir/git-version-gen .tarball-version` > diff --git a/libltdl/.gitignore b/libltdl/.gitignore > index 2f39096..5795dbc 100644 > --- a/libltdl/.gitignore > +++ b/libltdl/.gitignore > @@ -2,5 +2,4 @@ > /Makefile.am > /argz.h > /build-aux > +/m4 > -/dummy.c > -/gnulib.mk > Shouldn't these last two edits be done in a separate patch? Also, shouldn't you report the changes to file `libltdl/.gitignore' in the ChangeLog entry? > diff --git a/libltdl/m4/.gitignore b/libltdl/m4/.gitignore > deleted file mode 100644 > index 1facea7..0000000 > --- a/libltdl/m4/.gitignore > +++ /dev/null > @@ -1,6 +0,0 @@ > -/00gnulib.m4 > -/gnulib-cache.m4 > -/gnulib-common.m4 > -/gnulib-comp.m4 > -/gnulib-tool.m4 > -/ltversion.m4 > Ditto for the ChangeLog entry. Regards, Stefano
