This series is just a split-up version of the following patch, for better readability:
http://lists.gnu.org/archive/html/libtool-patches/2011-11/msg00156.html Pushed already, since the original was posted for review almost 2 weeks ago. * libtoolize.m4sh (require_Makefile_inc_filter): Rename from this... (require_ltdl_mk_filter): ...to this. Adjust all callers. Signed-off-by: Gary V. Vaughan <g...@gnu.org> --- libtoolize.m4sh | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libtoolize.m4sh b/libtoolize.m4sh index 31bbf3e..65972e7 100644 --- a/libtoolize.m4sh +++ b/libtoolize.m4sh @@ -788,7 +788,7 @@ func_install_pkgltdl_files () fi $require_Makefile_am_filter - $require_Makefile_inc_filter + $require_ltdl_mk_filter # Copy ltdl sources appropriate to the requested ltdl_mode. for file in $pkgltdl_files; do @@ -801,7 +801,7 @@ func_install_pkgltdl_files () ltdl.mk) test nonrecursive = "$ltdl_mode" || continue - my_copy_filter=$Makefile_inc_filter + my_copy_filter=$ltdl_mk_filter ;; aclocal.m4) @@ -1299,13 +1299,13 @@ $ltdl_ac_aux_dir" |$SED "$sed_make_literal_regex"` } -# require_Makefile_inc_filter -# --------------------------- -# Set `Makefile_inc_filter' ready for passing to func_copy in order for -# the contents of Makefile.inc to match the nonrecursive libltdl -# directory into which it is copied. -require_Makefile_inc_filter=func_require_Makefile_inc_filter -func_require_Makefile_inc_filter () +# require_ltdl_mk_filter +# ---------------------- +# Set `ltdl_mk_filter' ready for passing to func_copy in order for the +# contents of ltdl.mk to match the nonrecursive libltdl directory into +# which it is copied. +require_ltdl_mk_filter=func_require_ltdl_mk_filter +func_require_ltdl_mk_filter () { $debug_cmd @@ -1314,7 +1314,7 @@ func_require_Makefile_inc_filter () # Note that we strip comments right here, rather than rely on # using a $SED that allows comments. my_uscore=`$ECHO "$ltdl_dir" | $SED 's|[/.+-]|_|g'` - Makefile_inc_filter=`$ECHO ' + ltdl_mk_filter=`$ECHO ' /^[^#]/{ # Use only libltdl conditional objects. @@ -1333,7 +1333,7 @@ func_require_Makefile_inc_filter () }' | $SED '/^[ ]*#/d;/^$/d'` - require_Makefile_inc_filter=: + require_ltdl_mk_filter=: } -- 1.7.7.4 Cheers, -- Gary V. Vaughan (gary AT gnu DOT org)
