>From ca77d16fa4ec03ff527206d81675afffa69cc360 Mon Sep 17 00:00:00 2001
From: Peter Rosin <address@hidden>
Date: Wed, 25 Aug 2010 09:36:47 +0200
Subject: [PATCH 6/7] Use func_to_tool_path instead of fix_srcfile_path.

* libltdl/config/ltmain.m4sh (func_mode_compile): Replace the
fix_srcfile_path hook with a call to func_to_host_path.
* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) [cygwin,mingw,pw32]
[cegcc]: Drop fix_srcfile_path.

Signed-off-by: Peter Rosin <address@hidden>
---
 ChangeLog                  |    8 ++++++++
 libltdl/config/ltmain.m4sh |    5 ++---
 libltdl/m4/libtool.m4      |    3 ---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a914544..d944a5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-25  Peter Rosin  <address@hidden>
 
+	Use func_to_tool_path instead of fix_srcfile_path.
+	* libltdl/config/ltmain.m4sh (func_mode_compile): Replace the
+	fix_srcfile_path hook with a call to func_to_host_path.
+	* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) [cygwin,mingw,pw32]
+	[cegcc]: Drop fix_srcfile_path.
+
+2010-08-25  Peter Rosin  <address@hidden>
+
 	Convert file names to toolchain format in $NM and $AR @files.
 	* libltdl/config/ltmain.m4sh (func_mode_link): When listing
 	symbols and when creating archives using command files (or
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 8751c34..909db6f 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1167,9 +1167,8 @@ compiler."
     func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
+    func_to_tool_path "$srcfile"
+    srcfile=$func_to_tool_path_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 03786bc..7e4a146 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -4985,7 +4985,6 @@ _LT_EOF
 	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	# FIXME: Should let the user specify the lib program.
 	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 	;;
       esac
@@ -5511,8 +5510,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
     to runtime path list])
 _LT_TAGDECL([], [link_all_deplibs], [0],
     [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
 _LT_TAGDECL([], [always_export_symbols], [0],
     [Set to "yes" if exported symbols are required])
 _LT_TAGDECL([], [export_symbols_cmds], [2],
-- 
1.7.1