* 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 77bb3faa4fb9f0803aed6187016e2bf3c39295cc..0d48b6751dbfe3e58bd86c2b89a2d3d0a220ef4e 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-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * config/ltmain.m4sh (func_mode_link): $dlsymsobj is really

diff --git a/NEWS b/NEWS
index 08b81a16c1131b8f1c69186e4997838ab5fad5a0..f6138b160f797c7de6ee22b3d8ab1dfa2912bab0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 
 New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
 * Support for Portland Group compiler on Linux.
+* Fix libltdl on static platforms.
 \f
 New in 1.9f: 2004-10-23; CVS version 1.9e, Libtool team:
 * Calculate dllsearchpath correctly for wrapper scripts on cygwin.

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index a85eeeaa763d4ed4e2bb0e6ee80e0907538289ab..0b0b297e825e56bd396bb73af1cbddcf20e7a760 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