[vlc-commits] shm: move rules out of configure.ac

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 13:22:18 2012 +0300| [d4c32e837c326c5711cd888a4bb1e82d9efbda27] | committer: Rémi Denis-Courmont

shm: move rules out of configure.ac

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

 configure.ac              |    4 +---
 modules/LIST              |    2 +-
 modules/access/Modules.am |   13 ++++++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 30d7cd9..e47b797 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1054,10 +1054,8 @@ ALIASES="${ALIASES} cvlc rvlc"
 dnl
 dnl Some plugins aren't useful on some platforms
 dnl
-if test "${SYS}" = "os2"; then
+if test "${SYS}" != "mingw32"; then
     VLC_ADD_PLUGIN([dynamicoverlay])
-elif test "${SYS}" != "mingw32"; then
-    VLC_ADD_PLUGIN([dynamicoverlay access_shm])
 elif test "${SYS}" = "darwin"; then
     VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices])
 fi
diff --git a/modules/LIST b/modules/LIST
index 03a1e63..8242077 100644
--- a/modules/LIST
+++ b/modules/LIST
@@ -27,7 +27,6 @@ $Id$
  * access_rar: RAR access
  * access_realrtsp: Real RTSP access
  * access_sftp: SFTP network access module
- * access_shm: Shared memory framebuffer access module
  * access_smb: SMB shares access module
  * access_tcp: TCP Network access module
  * access_udp: UDP Network access module
@@ -285,6 +284,7 @@ $Id$
  * sepia: Sepia video filter
  * sharpen: Sharpen video filter
  * shine: MP3 encoder using Shine, a fixed point implementation
+ * shm: Shared memory framebuffer access module
  * sid: Sidplay demuxer
  * simple_channel_mixer: channel mixer
  * skins2: Skinnable interface, new generation
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index a70516d..c830309 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -120,11 +120,14 @@ endif
 
 ### Video capture ###
 
-libaccess_shm_plugin_la_SOURCES = shm.c
-libaccess_shm_plugin_la_CFLAGS = $(AM_CFLAGS)
-libaccess_shm_plugin_la_LIBADD = $(AM_LIBADD)
-libvlc_LTLIBRARIES += $(LTLIBaccess_shm)
-EXTRA_LTLIBRARIES += libaccess_shm_plugin.la
+libshm_plugin_la_SOURCES = shm.c
+libshm_plugin_la_CFLAGS = $(AM_CFLAGS)
+libshm_plugin_la_LIBADD = $(AM_LIBADD)
+if !HAVE_WIN32
+if !HAVE_OS2
+libvlc_LTLIBRARIES += libshm_plugin.la
+endif
+endif
 
 libv4l2_plugin_la_SOURCES = \
 	v4l2/videodev2.h \