From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 8 Dec 2011 08:14:44 +0000 (+0700)
Subject: libtoolize: rename ltdl.mk filter function.
X-Git-Tag: v2.4.2.418~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=402abf829e06be1938f7b8f064185944528e4c26;p=thirdparty%2Flibtool.git

libtoolize: rename ltdl.mk filter function.

* libtoolize.m4sh (require_Makefile_inc_filter): Rename from
this...
(require_ltdl_mk_filter): ...to this. Adjust all callers.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 31bbf3e79..65972e70e 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=:
 }