Emotion: Really disable vlc

SVN revision: 63132
This commit is contained in:
Sebastian Dransfeld 2011-09-03 20:47:28 +00:00
parent c038a2546e
commit ffb22a5c4e
3 changed files with 14 additions and 14 deletions

View File

@ -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

View File

@ -3,6 +3,6 @@ MAINTAINERCLEANFILES = Makefile.in
SUBDIRS =
if EMOTION_BUILD_VLC
SUBDIRS += vlc
endif
#if EMOTION_BUILD_VLC
#SUBDIRS += vlc
#endif

View File

@ -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@