[SCM] GNU Libtool branch, master, updated. release-2-2-2-32-gfffd7e6

[Eric Blake]

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  fffd7e67b2e5b0727f85d0b93a0b26165587a155 (commit)
       via  c35a08e87e1925129e1eb3e07dc23fd830154920 (commit)
      from  a53fd09bed347444f2c14db34d00de60d657d720 (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 fffd7e67b2e5b0727f85d0b93a0b26165587a155
Author: Eric Blake <address@hidden>
Date:   Wed Apr 30 10:51:33 2008 -0600

    Ignore backup files.
    
    Signed-off-by: Eric Blake <address@hidden>

commit c35a08e87e1925129e1eb3e07dc23fd830154920
Author: Eric Blake <address@hidden>
Date:   Wed Apr 30 10:49:45 2008 -0600

    Support cygwin 1.7.0 in loadlibrary loader.
    
    * libltdl/m4/ltdl.m4 (LT_LIB_DLLOAD) <cygwin>: Check for modern
    function.
    * libltdl/loaders/loadlibrary.c (vm_open): Avoid deprecated
    cygwin_conv_to_full_win32_path.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 .gitignore                    |    1 +
 ChangeLog                     |    8 ++++++++
 libltdl/loaders/loadlibrary.c |    9 ++++++++-
 libltdl/m4/ltdl.m4            |    3 ++-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 252219d..cacff4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
 *.aux
 *.cp
 *.cps
diff --git a/ChangeLog b/ChangeLog
index ca8c2a1..b3c0616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-30  Eric Blake  <address@hidden>
+
+       Support cygwin 1.7.0 in loadlibrary loader.
+       * libltdl/m4/ltdl.m4 (LT_LIB_DLLOAD) <cygwin>: Check for modern
+       function.
+       * libltdl/loaders/loadlibrary.c (vm_open): Avoid deprecated
+       cygwin_conv_to_full_win32_path.
+
 2008-04-29  Gary V. Vaughan  <address@hidden>
 
        New libtoolize --no-warn option and LIBTOOLIZE_OPTIONS parsing.
diff --git a/libltdl/loaders/loadlibrary.c b/libltdl/loaders/loadlibrary.c
index 609870c..5644676 100644
--- a/libltdl/loaders/loadlibrary.c
+++ b/libltdl/loaders/loadlibrary.c
@@ -136,7 +136,14 @@ vm_open (lt_user_data LT__UNUSED loader_data, const char 
*filename,
          return 0;
        }
 
-#if defined(__CYGWIN__)
+#if HAVE_DECL_CYGWIN_CONV_PATH
+      if (cygwin_conv_path (CCP_POSIX_TO_WIN_A, filename, wpath, MAX_PATH))
+       {
+         LT__SETERROR (CANNOT_OPEN);
+         return 0;
+       }
+      len = 0;
+#elif defined(__CYGWIN__)
       cygwin_conv_to_full_win32_path (filename, wpath);
       len = 0;
 #else
diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index f6b1064..ed71570 100644
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -47,7 +47,7 @@ m4_define([_LT_BUILD_PREFIX],
 [m4_ifdef([AC_AUTOCONF_VERSION],
    [m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.62]),
          [-1], [m4_ifdef([_AC_HAVE_TOP_BUILD_PREFIX],
-                         [${top_build_prefix}],
+                         [${top_build_prefix}],
                          [${top_builddir}/])],
          [${top_build_prefix}])],
    [${top_builddir}/])[]dnl
@@ -711,6 +711,7 @@ beos*)
   LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
   ;;
 cygwin* | mingw* | os2* | pw32*)
+  AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
   LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
   ;;
 esac


hooks/post-receive
--
GNU Libtool