[vlc-devel] commit: Do not load plugins from relative paths on non-relocatable platforms. ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 0.8.6-bugfix | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat May 10 14:28:23 2008 +0300| [c7cef4fdd8dd72ce0a45be3cda8ba98df5e83181]

Do not load plugins from relative paths on non-relocatable platforms.

This fixes #1578 for -bugfix. This breaks plugins from the source tree
(so we obviously need some more involved fix for master).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c7cef4fdd8dd72ce0a45be3cda8ba98df5e83181
---

 src/misc/modules.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 84e5413..a33a425 100644
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -752,8 +752,10 @@ static void AllocateAllPlugins( vlc_object_t *p_this )
     /* Yes, there are two NULLs because we replace one with "plugin-path". */
 #if defined( WIN32 ) || defined( UNDER_CE )
     char *path[] = { "modules", "", "plugins", 0, 0 };
-#else
+#elif defined( SYS_BEOS ) || defined( __APPLE__ )
     char *path[] = { "modules", PLUGIN_PATH, "plugins", 0, 0 };
+#else
+    char *path[] = { PLUGIN_PATH, NULL, NULL };
 #endif
 
     char **ppsz_path = path;