From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 1 Mar 2009 12:15:53 +0000 (+0200)
Subject: Use a different plugin for X11 screen
X-Git-Tag: 1.0.0-pre1~358
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9305440a3d6c2daf576bcbfe5ab012896dfeb237;p=vlc

Use a different plugin for X11 screen
---

diff --git a/configure.ac b/configure.ac
index 568932b7c2..d930baea93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3967,9 +3967,9 @@ AC_CHECK_HEADERS(X11/Xlib.h, [
   VLC_ADD_CPPFLAGS([vlc], [${X_CFLAGS}])
   VLC_ADD_LIBS([vlc], [${X_LIBS} ${X_PRE_LIBS} -lX11])
 
-  VLC_ADD_PLUGIN([screen])
-  VLC_ADD_CPPFLAGS([screen],[${X_CFLAGS}])
-  VLC_ADD_LIBS([screen],[${X_LIBS} ${X_PRE_LIBS} -lX11])
+  VLC_ADD_PLUGIN([x11_screen])
+  VLC_ADD_CPPFLAGS([x11_screen],[${X_CFLAGS}])
+  VLC_ADD_LIBS([x11_screen],[${X_LIBS} ${X_PRE_LIBS} -lX11])
 
   VLC_ADD_PLUGIN([panoramix])
   VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11])
diff --git a/modules/access/screen/Modules.am b/modules/access/screen/Modules.am
index dba9adde76..0e8f142fc9 100644
--- a/modules/access/screen/Modules.am
+++ b/modules/access/screen/Modules.am
@@ -6,8 +6,6 @@ screen_extra = beos.cpp
 else
 if HAVE_DARWIN
 screen_extra = mac.c
-else
-screen_extra = x11.c
 endif
 endif
 endif
@@ -16,3 +14,9 @@ SOURCES_screen = \
         screen.h \
         $(screen_extra) \
         $(NULL)
+
+SOURCES_x11_screen = \
+        screen.c \
+        screen.h \
+        x11.c \
+        $(NULL)