[SCM] GNU Libtool branch, master, updated. v2.2.8-19-g1a3cd36

[Gary V. Vaughan]

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  1a3cd365c08196584165a6dea16bd874e4a1004d (commit)
      from  9bf1ccc71a7f2990881db64d59b0039bf412a27e (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 1a3cd365c08196584165a6dea16bd874e4a1004d
Author: Peter Rosin <address@hidden>
Date:   Wed Jun 9 19:26:00 2010 +0700

    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 <address@hidden>

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

Summary of changes:
 ChangeLog      |    9 +++++++++
 NEWS           |    4 +++-
 libltdl/ltdl.c |    5 +++++
 3 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 216e6ce..0543999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-15  Peter Rosin  <address@hidden>
+
+       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  <address@hidden>
 
        Simplify license variations, and add missing license texts.
diff --git a/NEWS b/NEWS
index 5fd98ec..654208f 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 4e1a402..e1b4e2f 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="


hooks/post-receive
-- 
GNU Libtool