* m4/ltdl.m4 (LT_LIB_DLLOAD): Define HAVE_LIBDLLOADER if we

have a dlloader to preload.
* libltdl/ltdl.c (lt_dlinit): Only preload if HAVE_LIBDLLOADER, only
declare preloaded_symbols then.  Fixes libltdl on static platforms.
* NEWS: Updated.

diff --git a/ChangeLog b/ChangeLog
index edf0abf556cde8ebad8c15e1194ebdcbea42070c..c1d74a270c0706cf88e5181a2e447ad031fd94d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * m4/ltdl.m4 (LT_LIB_DLLOAD): Define HAVE_LIBDLLOADER if we
+       have a dlloader to preload.
+       * libltdl/ltdl.c (lt_dlinit): Only preload if HAVE_LIBDLLOADER, only
+       declare preloaded_symbols then.  Fixes libltdl on static platforms.
+       * NEWS: Updated.
+
 2004-11-29  Gary V. Vaughan  <gary@gnu.org>
 
        Add a search path option to libtoolize so that we can run it from

diff --git a/NEWS b/NEWS
index ad501f771400ac9d57f972f9995de9360f697c47..66444cefd72f37bf983ac5b8e4d4676f8a734f88 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 New in 2.1b: 2005-??-??; CVS version 2.1a, Libtool team:
 * New tests for support of Automake subdir-objects.
 * Support for Portland Group compiler on Linux.
+* Fix libltdl on static platforms.
 \f
 New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
 * Libtool versions can now be parallel installed, except that only one

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 9b583df1852c691b1ae51d942e2f244645f37306..fcbdc7cad0e97926f0e4480ae5f8da8f61d94244 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -189,7 +189,9 @@ loader_init (lt_get_vtable *vtable_func, lt_user_data data)
 #define preloaded_symbols      LT_CONC3(lt_, LTDLOPEN, _LTX_preloaded_symbols)
 
 LT_SCOPE const lt_dlvtable *   get_vtable (lt_user_data data);
+#ifdef HAVE_LIBDLLOADER
 LT_SCOPE lt_dlsymlist          preloaded_symbols;
+#endif
 
 /* Initialize libltdl. */
 int
@@ -211,6 +213,7 @@ lt_dlinit (void)
 
       /* Now open all the preloaded module loaders, so the application
         can use _them_ to lt_dlopen its own modules.  */
+#ifdef HAVE_LIBDLLOADER
       if (!errors)
        {
          errors += lt_dlpreload (&preloaded_symbols);
@@ -220,6 +223,7 @@ lt_dlinit (void)
        {
          errors += lt_dlpreload_open (LT_STR(LTDLOPEN), loader_init_callback);
        }
+#endif /* HAVE_LIBDLLOADER */
     }
 
   return errors;

diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index 2c329e9454cf3f469f4feb995730a2d6da36f357..ade1e1fc363dccaf65c7b66bb36e8bfa753f3e19 100644 (file)
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -459,9 +459,14 @@ AC_SUBST([LIBADD_DLD_LINK])
 
 m4_pattern_allow([^LT_DLPREOPEN$])
 LT_DLPREOPEN=
-for lt_loader in $LT_DLLOADERS; do
-  LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen loaders/$lt_loader "
-done
+if test -n "$LT_DLLOADERS"
+then
+  for lt_loader in $LT_DLLOADERS; do
+    LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen loaders/$lt_loader "
+  done
+  AC_DEFINE([HAVE_LIBDLLOADER], [1],
+            [Define if libdlloader will be built on this platform])
+fi
 AC_SUBST([LT_DLPREOPEN])
 
 dnl This isn't used anymore, but set it for backwards compatibility