* ltmain.in (infer_tag, win32_libid): Style changes. Rename

infer_tag to func_infer_tag and win32_libid to func_win32_libid.
* libtool.m4 (cygwin): rename win32_libid to func_win32_libid.

diff --git a/ChangeLog b/ChangeLog
index c3c225b6a9f74b4ce3ee3c0c79f2df58ce11ae56..302687396c2b02d865c8754421445b82f5dabd86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-05  Peter O'Gorman  <peter@pogma.com>
+       
+       * ltmain.in (infer_tag, win32_libid): Style changes. Rename
+       infer_tag to func_infer_tag and win32_libid to func_win32_libid.
+       * libtool.m4 (cygwin): rename win32_libid to func_win32_libid.
+       
 2004-02-04  Peter O'Gorman  <peter@pogma.com>
        
        * ltmain.in (infer_tag): Move tag inferrence to a shell function.

diff --git a/libtool.m4 b/libtool.m4
index 86d03f4d86ab6a074679db380fc50bfee35447f0..ea3a141548bba133552dc56b89a6cf040c22b383 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -2117,14 +2117,14 @@ bsdi4*)
   ;;
 
 cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
+  # func_win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;

diff --git a/ltmain.in b/ltmain.in
index 3a7c1b58443b0629aae6580d447b292b6c9a86e8..4d62bf9f734b9ca54533cb18318b99bcc901c66d 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -119,10 +119,13 @@ o2lo="s/\\.${objext}\$/.lo/"
 # Shell function definitions:
 # This seems to be the best place for them
 
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
-win32_libid () {
+func_win32_libid () {
   win32_libid_type="unknown"
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
@@ -156,12 +159,13 @@ win32_libid () {
 }
 
 
-
-infer_tag () {
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag () {
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
@@ -580,7 +584,7 @@ if test -z "$show_help"; then
       ;;
     esac
 
-    infer_tag $base_compile
+    func_infer_tag $base_compile
 
     for arg in $later; do
       case $arg in
@@ -928,7 +932,7 @@ EOF
     vinfo=
     vinfo_number=no
 
-    infer_tag $base_compile
+    func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
     for arg