From 857575d431857d0caf4f6038180aac57db6006d0 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Thu, 24 Mar 2011 02:29:55 +0000 Subject: [PATCH] re-disable vlc git-svn-id: http://svn.enlightenment.org/svn/e/trunk/emotion@58053 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 13 +++++++++---- src/modules/Makefile.am | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 9743ee8..88c1bd6 100644 --- a/configure.ac +++ b/configure.ac @@ -184,12 +184,18 @@ EMOTION_CHECK_MODULE([Xine], [${want_xine}]) EMOTION_CHECK_MODULE([Gstreamer], [${want_gstreamer}]) EMOTION_CHECK_MODULE([VLC], [${want_vlc}]) -if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno" && test "x${enable_vlc}" = "xno" ; then - AC_MSG_ERROR([Xine, Gstreamer or VLC backends must be selected to build Emotion]) +#disabled vlc +#if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno" && test "x${enable_vlc}" = "xno" ; then +if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno"; then +#disabled vlc +# AC_MSG_ERROR([Xine, Gstreamer or VLC backends must be selected to build Emotion]) + AC_MSG_ERROR([Xine or Gstreamer backends must be selected to build Emotion]) fi AC_SUBST(requirement_emotion) +#disabled vlc +#src/modules/vlc/Makefile AC_OUTPUT([ Makefile @@ -200,7 +206,6 @@ src/lib/Makefile src/modules/Makefile src/modules/xine/Makefile src/modules/gstreamer/Makefile -src/modules/vlc/Makefile src/edje_external/Makefile src/bin/Makefile data/Makefile @@ -221,7 +226,7 @@ echo "Configuration Options Summary:" echo echo " Modules:" echo " Xine...............: ${enable_xine}" -echo " Vlc................: ${enable_vlc}" +#echo " Vlc................: ${enable_vlc}" echo " Gstreamer..........: ${enable_gstreamer}" echo echo " Build emotion_test...: $have_emotion_test" diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index aac1813..1af8c8c 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -1,4 +1,4 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = xine gstreamer vlc +SUBDIRS = xine gstreamer -- 2.7.4