* libltdl/m4/ltdl.m4 (LT_LIB_DLLOAD): Search for dlopen without

depending on -ldl, required by cygwin 1.5.20.

diff --git a/ChangeLog b/ChangeLog
index 33353bb4d3917dadbd1498d6e4d0e1c4e09fa562..5ce2d13582ad372f5337690669745cca810a7880 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-21  Eric Blake  <ebb9@byu.net>
+
+       * libltdl/m4/ltdl.m4 (LT_LIB_DLLOAD): Search for dlopen without
+       depending on -ldl, required by cygwin 1.5.20.
+
 2006-06-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * libltdl/m4/libtool.m4 (_LT_COMPILER_BOILERPLATE)

diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index 648fc43ff08d37405d0603d7199edc2227ecb5d9..8416357905d4ebfbb07873e46e8d26e878d6ac7f 100644 (file)
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -1,11 +1,11 @@
 # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
-# Copyright (C) 1999-2005 Free Software Foundation, Inc.
+# Copyright (C) 1999-2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 9 LTDL_INIT
+# serial 10 LTDL_INIT
 
 # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
 # ------------------------------------------
@@ -108,7 +108,7 @@ dnl location!  This also ensures lt_ltdl_dir is set when configure.ac is
 dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
 m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
 
-AC_CHECK_LIB(ltdl, lt_dlinit,
+AC_CHECK_LIB([ltdl], [lt_dlinit],
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
      AC_MSG_WARN([libltdl not installed, but installation disabled])
@@ -515,10 +515,13 @@ AC_SUBST([LT_DLLOADERS])
 AC_LANG_PUSH([C])
 
 LIBADD_DLOPEN=
-AC_CHECK_LIB([dl], [dlopen],
+AC_SEARCH_LIBS([dlopen], [dl],
        [AC_DEFINE([HAVE_LIBDL], [1],
                   [Define if you have the libdl library or equivalent.])
-       LIBADD_DLOPEN="-ldl" libltdl_cv_lib_dl_dlopen="yes"
+       if test "$ac_cv_search_dlopen" != "none required" ; then
+         LIBADD_DLOPEN="-ldl"
+       fi
+       libltdl_cv_lib_dl_dlopen="yes"
        LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
     [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H
 #  include <dlfcn.h>