[SCM] GNU Libtool branch, master, updated. v2.2.10-163-g18a8562

[Peter Rosin]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  18a85621b92fbeac985484679a2160c7bb2433c6 (commit)
      from  0b71549aa23299ed3909e1483d0532a0a79a1e7b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 18a85621b92fbeac985484679a2160c7bb2433c6
Author: Peter Rosin <address@hidden>
Date:   Thu Sep 9 20:51:27 2010 +0200

    Fix dependency tracking for MSYS/MinGW.
    
    * libltdl/config/ltmain.m4sh (func_to_tool_file): Add lazy
    argument which allows the user to specify conversions that are
    not desired.
    (func_mode_compile): Don't convert source files on MSYS, as
    MSYS does it for us. This fixes a regression introduced by
    "Use func_to_tool_file instead of fix_srcfile_path".
    Reported by Charles Wilson.
    
    Signed-off-by: Peter Rosin <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |   11 +++++++++++
 libltdl/config/ltmain.m4sh |   18 +++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e17222..5d4876b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-09  Peter Rosin  <address@hidden>
+
+       Fix dependency tracking for MSYS/MinGW.
+       * libltdl/config/ltmain.m4sh (func_to_tool_file): Add lazy
+       argument which allows the user to specify conversions that are
+       not desired.
+       (func_mode_compile): Don't convert source files on MSYS, as
+       MSYS does it for us. This fixes a regression introduced by
+       "Use func_to_tool_file instead of fix_srcfile_path".
+       Reported by Charles Wilson.
+
 2010-09-08  Peter Rosin  <address@hidden>
 
        Mention adjustment of naming of MSVC import libraries in NEWS.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 1a7bd96..b2d0f88 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -873,14 +873,22 @@ func_to_host_file ()
 # end func_to_host_file
 
 
-# func_to_tool_file ARG
+# func_to_tool_file ARG LAZY
 # converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
 func_to_tool_file ()
 {
   $opt_debug
-  $to_tool_file_cmd "$1"
-  func_to_tool_file_result=$func_to_host_file_result
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
 }
 # end func_to_tool_file
 
@@ -1376,7 +1384,7 @@ compiler."
     func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    func_to_tool_file "$srcfile"
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
     srcfile=$func_to_tool_file_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result


hooks/post-receive
-- 
GNU Libtool