From ffb22a5c4ecab0b06467c669734994e0603d7be1 Mon Sep 17 00:00:00 2001
From: Sebastian Dransfeld <sd@tango.flipp.net>
Date: Sat, 3 Sep 2011 20:47:28 +0000
Subject: [PATCH] Emotion: Really disable vlc

SVN revision: 63132
---
 legacy/emotion/configure.ac                   |  2 +-
 .../emotion/src/generic_players/Makefile.am   |  6 +++---
 legacy/emotion/src/lib/Makefile.am            | 20 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index bc0b439d73..8cdf17b788 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -230,7 +230,7 @@ AC_MSG_RESULT([${have_v4l2}])
 
 EMOTION_CHECK_MODULE([Xine], [${want_xine}])
 EMOTION_CHECK_MODULE([Gstreamer], [${want_gstreamer}])
-EMOTION_CHECK_MODULE([VLC], [${want_vlc}])
+#disabled vlc EMOTION_CHECK_MODULE([VLC], [${want_vlc}])
 EMOTION_CHECK_MODULE([generic], [${want_generic}])
 
 #disabled vlc
diff --git a/legacy/emotion/src/generic_players/Makefile.am b/legacy/emotion/src/generic_players/Makefile.am
index ad31accc35..7d1f5d8ed2 100644
--- a/legacy/emotion/src/generic_players/Makefile.am
+++ b/legacy/emotion/src/generic_players/Makefile.am
@@ -3,6 +3,6 @@ MAINTAINERCLEANFILES = Makefile.in
 
 SUBDIRS =
 
-if EMOTION_BUILD_VLC
-SUBDIRS += vlc
-endif
+#if EMOTION_BUILD_VLC
+#SUBDIRS += vlc
+#endif
diff --git a/legacy/emotion/src/lib/Makefile.am b/legacy/emotion/src/lib/Makefile.am
index 83df62f456..0f48f11738 100644
--- a/legacy/emotion/src/lib/Makefile.am
+++ b/legacy/emotion/src/lib/Makefile.am
@@ -21,9 +21,9 @@ if EMOTION_STATIC_BUILD_GSTREAMER
 AM_CPPFLAGS += @GSTREAMER_CFLAGS@
 endif
 
-if EMOTION_STATIC_BUILD_VLC
-AM_CPPFLAGS += @VLC_CFLAGS@
-endif
+#if EMOTION_STATIC_BUILD_VLC
+#AM_CPPFLAGS += @VLC_CFLAGS@
+#endif
 
 lib_LTLIBRARIES      = libemotion.la
 includes_HEADERS      = Emotion.h
@@ -43,10 +43,10 @@ $(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \
 $(top_srcdir)/src/modules/gstreamer/emotion_sink.c
 endif
 
-if EMOTION_STATIC_BUILD_VLC
-libemotion_la_SOURCES += \
-$(top_srcdir)/src/modules/vlc/emotion_vlc.c
-endif
+#if EMOTION_STATIC_BUILD_VLC
+#libemotion_la_SOURCES += \
+#$(top_srcdir)/src/modules/vlc/emotion_vlc.c
+#endif
 
 libemotion_la_LIBADD = @EMOTION_LIBS@ @EIO_LIBS@ @EEZE_LIBS@
 
@@ -58,9 +58,9 @@ if EMOTION_STATIC_BUILD_GSTREAMER
 libemotion_la_LIBADD += @GSTREAMER_LIBS@
 endif
 
-if EMOTION_STATIC_BUILD_VLC
-libemotion_la_LIBADD += @VLC_LIBS@
-endif
+#if EMOTION_STATIC_BUILD_VLC
+#libemotion_la_LIBADD += @VLC_LIBS@
+#endif
 
 libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@