From 4579813efecfd3673651b8365b6ec030962bbac5 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 1 Nov 2010 01:53:16 +0000 Subject: [PATCH] disable vlc module in emotion. that will get rid of the problem. SVN revision: 54070 --- legacy/emotion/configure.ac | 14 ++++++++++---- legacy/emotion/src/modules/Makefile.am | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac index 217925186d..a843a5e47a 100644 --- a/legacy/emotion/configure.ac +++ b/legacy/emotion/configure.ac @@ -192,12 +192,19 @@ 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 emotion.pc @@ -207,7 +214,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 @@ -228,7 +234,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/legacy/emotion/src/modules/Makefile.am b/legacy/emotion/src/modules/Makefile.am index aac1813545..1af8c8c7e8 100644 --- a/legacy/emotion/src/modules/Makefile.am +++ b/legacy/emotion/src/modules/Makefile.am @@ -1,4 +1,4 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = xine gstreamer vlc +SUBDIRS = xine gstreamer