summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-11-01 01:53:16 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-11-01 01:53:16 +0000
commit4579813efecfd3673651b8365b6ec030962bbac5 (patch)
tree20d4409f2d60be99a448f0c6d65c877068f94c2b /legacy/emotion
parent0d32e98d24bd80dc1681c8f15103c7e21d46467c (diff)
disable vlc module in emotion. that will get rid of the problem.
SVN revision: 54070
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/configure.ac14
-rw-r--r--legacy/emotion/src/modules/Makefile.am2
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}])
192EMOTION_CHECK_MODULE([Gstreamer], [${want_gstreamer}]) 192EMOTION_CHECK_MODULE([Gstreamer], [${want_gstreamer}])
193EMOTION_CHECK_MODULE([VLC], [${want_vlc}]) 193EMOTION_CHECK_MODULE([VLC], [${want_vlc}])
194 194
195if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno" && test "x${enable_vlc}" = "xno" ; then 195#disabled vlc
196 AC_MSG_ERROR([Xine, Gstreamer or VLC backends must be selected to build Emotion]) 196#if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno" && test "x${enable_vlc}" = "xno" ; then
197if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno"; then
198#disabled vlc
199# AC_MSG_ERROR([Xine, Gstreamer or VLC backends must be selected to build Emotion])
200 AC_MSG_ERROR([Xine or Gstreamer backends must be selected to build Emotion])
197fi 201fi
198 202
199AC_SUBST(requirement_emotion) 203AC_SUBST(requirement_emotion)
200 204
205#disabled vlc
206#src/modules/vlc/Makefile
207
201AC_OUTPUT([ 208AC_OUTPUT([
202Makefile 209Makefile
203emotion.pc 210emotion.pc
@@ -207,7 +214,6 @@ src/lib/Makefile
207src/modules/Makefile 214src/modules/Makefile
208src/modules/xine/Makefile 215src/modules/xine/Makefile
209src/modules/gstreamer/Makefile 216src/modules/gstreamer/Makefile
210src/modules/vlc/Makefile
211src/edje_external/Makefile 217src/edje_external/Makefile
212src/bin/Makefile 218src/bin/Makefile
213data/Makefile 219data/Makefile
@@ -228,7 +234,7 @@ echo "Configuration Options Summary:"
228echo 234echo
229echo " Modules:" 235echo " Modules:"
230echo " Xine...............: ${enable_xine}" 236echo " Xine...............: ${enable_xine}"
231echo " Vlc................: ${enable_vlc}" 237#echo " Vlc................: ${enable_vlc}"
232echo " Gstreamer..........: ${enable_gstreamer}" 238echo " Gstreamer..........: ${enable_gstreamer}"
233echo 239echo
234echo " Build emotion_test...: $have_emotion_test" 240echo " 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 @@
1 1
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4SUBDIRS = xine gstreamer vlc 4SUBDIRS = xine gstreamer