summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-03-24 02:29:55 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-03-24 02:29:55 +0000
commitb49b3676ec8263b405fa8d59b0c97e8806b906cf (patch)
treed254b2b5cf5441c947089847902c4cefb63b0cb4 /legacy
parentf2bf8bbfd9a2ae0694397d679f1803ee1af55722 (diff)
re-disable vlc
SVN revision: 58053
Diffstat (limited to 'legacy')
-rw-r--r--legacy/emotion/configure.ac13
-rw-r--r--legacy/emotion/src/modules/Makefile.am2
2 files changed, 10 insertions, 5 deletions
diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index 9743ee8350..88c1bd6de5 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -184,12 +184,18 @@ EMOTION_CHECK_MODULE([Xine], [${want_xine}])
184EMOTION_CHECK_MODULE([Gstreamer], [${want_gstreamer}]) 184EMOTION_CHECK_MODULE([Gstreamer], [${want_gstreamer}])
185EMOTION_CHECK_MODULE([VLC], [${want_vlc}]) 185EMOTION_CHECK_MODULE([VLC], [${want_vlc}])
186 186
187if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno" && test "x${enable_vlc}" = "xno" ; then 187#disabled vlc
188 AC_MSG_ERROR([Xine, Gstreamer or VLC backends must be selected to build Emotion]) 188#if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno" && test "x${enable_vlc}" = "xno" ; then
189if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno"; then
190#disabled vlc
191# AC_MSG_ERROR([Xine, Gstreamer or VLC backends must be selected to build Emotion])
192 AC_MSG_ERROR([Xine or Gstreamer backends must be selected to build Emotion])
189fi 193fi
190 194
191AC_SUBST(requirement_emotion) 195AC_SUBST(requirement_emotion)
192 196
197#disabled vlc
198#src/modules/vlc/Makefile
193 199
194AC_OUTPUT([ 200AC_OUTPUT([
195Makefile 201Makefile
@@ -200,7 +206,6 @@ src/lib/Makefile
200src/modules/Makefile 206src/modules/Makefile
201src/modules/xine/Makefile 207src/modules/xine/Makefile
202src/modules/gstreamer/Makefile 208src/modules/gstreamer/Makefile
203src/modules/vlc/Makefile
204src/edje_external/Makefile 209src/edje_external/Makefile
205src/bin/Makefile 210src/bin/Makefile
206data/Makefile 211data/Makefile
@@ -221,7 +226,7 @@ echo "Configuration Options Summary:"
221echo 226echo
222echo " Modules:" 227echo " Modules:"
223echo " Xine...............: ${enable_xine}" 228echo " Xine...............: ${enable_xine}"
224echo " Vlc................: ${enable_vlc}" 229#echo " Vlc................: ${enable_vlc}"
225echo " Gstreamer..........: ${enable_gstreamer}" 230echo " Gstreamer..........: ${enable_gstreamer}"
226echo 231echo
227echo " Build emotion_test...: $have_emotion_test" 232echo " 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