[vlc-devel] [PATCH 22/27] modules: use VLC_PLUGIN_PATH if it exists

[Romain Vimont]

On Thu, Jun 25, 2020 at 05:37:42PM +0300, Rémi Denis-Courmont wrote:
> Le torstaina 25. kesäkuuta 2020, 15.23.09 EEST Romain Vimont a écrit :
> > Do not overwrite the VLC_PLUGIN_PATH environment variable if it exists.
> 
> Overriding is very much done on purpose. Otherwise, it would be disastrous 
> when people develop with the variable set and everything in the build tree 
> suddently starts failing.
> 
> -1

Would it be ok to force VLC_PLUGIN_PATH to "modules:doc" instead of
"modules" when the flag is enabled? (or always?)

--------8<------------------------------------------------------------
diff --git a/bin/vlc.c b/bin/vlc.c
index 4e22ca2db3..596453548b 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -130,7 +130,12 @@ int main(int argc, const char *argv[])
 #endif
 
 #ifdef TOP_BUILDDIR
-    setenv ("VLC_PLUGIN_PATH", TOP_BUILDDIR"/modules", 0);
+# ifdef WANT_OPENGL_FILTERS_SAMPLES
+#  define VLC_PLUGIN_PATH_VALUE TOP_BUILDDIR"/modules:"TOP_BUILDDIR"/doc"
+# else
+#  define VLC_PLUGIN_PATH_VALUE TOP_BUILDDIR"/modules"
+# endif
+    setenv ("VLC_PLUGIN_PATH", VLC_PLUGIN_PATH_VALUE, 1);
     setenv ("VLC_DATA_PATH", TOP_SRCDIR"/share", 1);
     setenv ("VLC_LIB_PATH", TOP_BUILDDIR"/modules", 1);
 #endif
diff --git a/configure.ac b/configure.ac
index 288385e829..b1ac7a9e9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -386,6 +386,9 @@ AC_ARG_ENABLE([opengl_filters_samples],
                    [Build OpenGL filters samples (default disabled)]))
 AM_CONDITIONAL([WANT_OPENGL_FILTERS_SAMPLES],
                [test "${enable_opengl_filters_samples}" = "yes"])
+AM_COND_IF([WANT_OPENGL_FILTERS_SAMPLES], [
+  AC_DEFINE([WANT_OPENGL_FILTERS_SAMPLES], [1], [Build OpenGL filters samples.])
+])
 
 vlc_winstore_app=0
 AS_IF([test "${SYS}" = "mingw32"],[
--------8<------------------------------------------------------------


> 
> -- 
> Реми Дёни-Курмон
> http://www.remlab.net/
> 
> 
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel