From: Peter Rosin <peda@lysator.liu.se>
Date: Wed, 9 Jun 2010 12:26:00 +0000 (+0700)
Subject: Don't try the MSYS libdir path on MinGW.
X-Git-Tag: v2.2.10~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a3cd365c08196584165a6dea16bd874e4a1004d;p=thirdparty%2Flibtool.git

Don't try the MSYS libdir path on MinGW.

* libltdl/ltdl.c (parse_dotla_file) [mingw]: The absolute
libdir path in the .la file is recorded as an MSYS (POSIX
style) path. Make sure it isn't tried when locating the
shared library.
* NEWS: Updated.

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

diff --git a/ChangeLog b/ChangeLog
index 216e6ce8d..054399949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-15  Peter Rosin  <peda@lysator.liu.se>
+
+	Don't try the MSYS libdir path on MinGW.
+	* libltdl/ltdl.c (parse_dotla_file) [mingw]: The absolute
+	libdir path in the .la file is recorded as an MSYS (POSIX
+	style) path. Make sure it isn't tried when locating the
+	shared library.
+	* NEWS: Updated.
+
 2010-06-09  Gary V. Vaughan  <gary@gnu.org>
 
 	Simplify license variations, and add missing license texts.
diff --git a/NEWS b/NEWS
index 5fd98ec87..654208f98 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,9 @@ New in 2.2.9b 2010-??-??: git version 2.2.9a, Libtool team:
 
 * New features:
 
-  - None.
+  - On non-cygwin Windows systems, we no longer try to lookup the POSIX
+    format path recorded in $libdir of a pseudo-library when looking up
+    the location of the library with the native tools.
 
 New in 2.2.8 2010-06-05: git version 2.2.7c, Libtool team:
 
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 4e1a4025f..e1b4e2f23 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1076,12 +1076,17 @@ parse_dotla_file(FILE *file, char **dlname, char **libdir, char **deplibs,
 	{
 	  errors += trim (old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
 	}
+
+      /* Windows native tools do not understand the POSIX paths we store
+	 in libdir. */
+#ifndef __WINDOWS__
 #undef  STR_LIBDIR
 #define STR_LIBDIR	"libdir="
       else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
 	{
 	  errors += trim (libdir, &line[sizeof(STR_LIBDIR) - 1]);
 	}
+#endif
 
 #undef  STR_DL_DEPLIBS
 #define STR_DL_DEPLIBS	"dependency_libs="