* do not use a dynamic linker if no plugin support was detected/requested.

diff --git a/configure.ac b/configure.ac
index f6d3e643cc3c1ace1d89945df7bb570d54539455..376bede94c912a1f6d849121bfb6c1ad866b87e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4257,6 +4257,7 @@ fi
 dnl Export automake variables
 if ${plugin_support}
 then
+  AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins)
   for plugin in `echo ${PLUGINS}`
   do
     eval "${plugin}_p=yes"

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 8b40d6e0db2f18a6424ae22af706d0b6234f18c3..8b8205f98b49d87d5c79bee052c1eb1c5ee9c871 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -51,8 +51,9 @@
 #   include <unistd.h>
 #endif
 
-#define HAVE_DYNAMIC_PLUGINS
-#if defined(HAVE_DL_DYLD)
+#if !defined(HAVE_DYNAMIC_PLUGINS)
+    /* no support for plugins */
+#elif defined(HAVE_DL_DYLD)
 #   if defined(HAVE_MACH_O_DYLD_H)
 #       include <mach-o/dyld.h>
 #   endif
@@ -73,8 +74,6 @@
 #   if defined(HAVE_DL_H)
 #       include <dl.h>
 #   endif
-#else
-#   undef HAVE_DYNAMIC_PLUGINS
 #endif
 
 #include "vlc_error.h"