Update code to use libtool 2.2. Use convenience recursive libltdl.

[pulseaudio] / src / daemon / ltdl-bind-now.c

diff --git a/src/daemon/ltdl-bind-now.c b/src/daemon/ltdl-bind-now.c
index 6025c6e350ed05284a331b51683eb66f94d655ae..6821aac4220a3c5ec7f120647c0920c9c5f786b1 100644 (file)
--- a/src/daemon/ltdl-bind-now.c
+++ b/src/daemon/ltdl-bind-now.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
 
@@ -34,8 +32,12 @@
 #include <sys/dl.h>
 #endif
 
+#include <string.h>
+
 #include <ltdl.h>
 
+#include <pulse/i18n.h>
+
 #include <pulsecore/macro.h>
 #include <pulsecore/mutex.h>
 #include <pulsecore/thread.h>
@@ -51,26 +53,6 @@
 #undef PA_BIND_NOW
 #endif
 
-static pa_mutex *libtool_mutex = NULL;
-
-PA_STATIC_TLS_DECLARE_NO_FREE(libtool_tls);
-
-static void libtool_lock(void) {
-    pa_mutex_lock(libtool_mutex);
-}
-
-static void libtool_unlock(void) {
-    pa_mutex_unlock(libtool_mutex);
-}
-
-static void libtool_set_error(const char *error) {
-    PA_STATIC_TLS_SET(libtool_tls, (char*) error);
-}
-
-static const char *libtool_get_error(void) {
-    return PA_STATIC_TLS_GET(libtool_tls);
-}
-
 #ifdef PA_BIND_NOW
 
 /*
@@ -85,7 +67,8 @@ static const char *libtool_get_error(void) {
   to set $LT_BIND_NOW before starting the pulsaudio binary.
 */
 
-static lt_module bind_now_open(lt_user_data d, const char *fname) {
+static lt_module bind_now_open(lt_user_data d, const char *fname, lt_dladvise advise)
+{
     lt_module m;
 
     pa_assert(fname);
@@ -129,32 +112,35 @@ static lt_ptr bind_now_find_sym(lt_user_data d, lt_module m, const char *symbol)
 void pa_ltdl_init(void) {
 
 #ifdef PA_BIND_NOW
-    lt_dlloader *place;
-    static const struct lt_user_dlloader loader = {
-        .module_open = bind_now_open,
-        .module_close = bind_now_close,
-        .find_sym = bind_now_find_sym
-    };
+    static const lt_dlvtable *dlopen_loader;
+    static lt_dlvtable bindnow_loader;
 #endif
 
     pa_assert_se(lt_dlinit() == 0);
-    pa_assert_se(libtool_mutex = pa_mutex_new(TRUE, FALSE));
-    pa_assert_se(lt_dlmutex_register(libtool_lock, libtool_unlock, libtool_set_error, libtool_get_error) == 0);
 
 #ifdef PA_BIND_NOW
+    /* Already initialised */
+    if (dlopen_loader)
+        return;
+
+    if (!(dlopen_loader = lt_dlloader_find("dlopen"))) {
+        pa_log_warn(_("Failed to find original dlopen loader."));
+        return;
+    }
 
-    if (!(place = lt_dlloader_find("dlopen")))
-        place = lt_dlloader_next(NULL);
+    memcpy(&bindnow_loader, dlopen_loader, sizeof(bindnow_loader));
+    bindnow_loader.name = "bind-now-loader";
+    bindnow_loader.module_open = bind_now_open;
+    bindnow_loader.module_close = bind_now_close;
+    bindnow_loader.find_sym = bind_now_find_sym;
+    bindnow_loader.priority = LT_DLLOADER_PREPEND;
 
     /* Add our BIND_NOW loader as the default module loader. */
-    if (lt_dlloader_add(place, &loader, "bind-now-loader") != 0)
-        pa_log_warn("Failed to add bind-now-loader.");
+    if (lt_dlloader_add(&bindnow_loader) != 0)
+        pa_log_warn(_("Failed to add bind-now-loader."));
 #endif
 }
 
 void pa_ltdl_done(void) {
     pa_assert_se(lt_dlexit() == 0);
-    pa_mutex_free(libtool_mutex);
-    libtool_mutex = NULL;
 }
-