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 <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index ca8c2a1f5277edb1dc53d3865d8a4a01647e243a..b3c0616845211d690cee80a28de7713801d248b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-30  Eric Blake  <ebb9@byu.net>
+
+       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  <gary@gnu.org>
 
        New libtoolize --no-warn option and LIBTOOLIZE_OPTIONS parsing.

diff --git a/libltdl/loaders/loadlibrary.c b/libltdl/loaders/loadlibrary.c
index 609870cd48e7ded28959f576fcccc3380466947e..5644676516d681bc4fa967f58e80c094c2f131ff 100644 (file)
--- 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 f6b1064003539a2078c444f019d6c1398860e85a..ed71570e8e6a63381f7a34e3fd16d7192a176799 100644 (file)
--- 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