Skip to content

V
vlc-2-2
Commit a110441d authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

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

parent 9e3dfd25
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
configure.ac
View file @ a110441d
...@@ -4257,6 +4257,7 @@ fi ...@@ -4257,6 +4257,7 @@ fi
dnl Export automake variables dnl Export automake variables
if ${plugin_support} if ${plugin_support}
then then
AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins)
for plugin in `echo ${PLUGINS}` for plugin in `echo ${PLUGINS}`
do do
eval "${plugin}_p=yes" eval "${plugin}_p=yes"
......
src/misc/modules.c
View file @ a110441d
...@@ -51,8 +51,9 @@ ...@@ -51,8 +51,9 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#define HAVE_DYNAMIC_PLUGINS #if !defined(HAVE_DYNAMIC_PLUGINS)
#if defined(HAVE_DL_DYLD) /* no support for plugins */
#elif defined(HAVE_DL_DYLD)
# if defined(HAVE_MACH_O_DYLD_H) # if defined(HAVE_MACH_O_DYLD_H)
# include <mach-o/dyld.h> # include <mach-o/dyld.h>
# endif # endif
...@@ -73,8 +74,6 @@ ...@@ -73,8 +74,6 @@
# if defined(HAVE_DL_H) # if defined(HAVE_DL_H)
# include <dl.h> # include <dl.h>
# endif # endif
#else
# undef HAVE_DYNAMIC_PLUGINS
#endif #endif
#include "vlc_error.h" #include "vlc_error.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment