diff options
author | Carsten Haitzler <raster@rasterman.com> | 2010-11-01 01:53:16 +0000 |
---|---|---|
committer | Carsten Haitzler <raster@rasterman.com> | 2010-11-01 01:53:16 +0000 |
commit | 4579813efecfd3673651b8365b6ec030962bbac5 (patch) | |
tree | 20d4409f2d60be99a448f0c6d65c877068f94c2b /legacy/emotion | |
parent | 0d32e98d24bd80dc1681c8f15103c7e21d46467c (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.ac | 14 | ||||
-rw-r--r-- | 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}]) | |||
192 | EMOTION_CHECK_MODULE([Gstreamer], [${want_gstreamer}]) | 192 | EMOTION_CHECK_MODULE([Gstreamer], [${want_gstreamer}]) |
193 | EMOTION_CHECK_MODULE([VLC], [${want_vlc}]) | 193 | EMOTION_CHECK_MODULE([VLC], [${want_vlc}]) |
194 | 194 | ||
195 | if 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 |
197 | if 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]) | ||
197 | fi | 201 | fi |
198 | 202 | ||
199 | AC_SUBST(requirement_emotion) | 203 | AC_SUBST(requirement_emotion) |
200 | 204 | ||
205 | #disabled vlc | ||
206 | #src/modules/vlc/Makefile | ||
207 | |||
201 | AC_OUTPUT([ | 208 | AC_OUTPUT([ |
202 | Makefile | 209 | Makefile |
203 | emotion.pc | 210 | emotion.pc |
@@ -207,7 +214,6 @@ src/lib/Makefile | |||
207 | src/modules/Makefile | 214 | src/modules/Makefile |
208 | src/modules/xine/Makefile | 215 | src/modules/xine/Makefile |
209 | src/modules/gstreamer/Makefile | 216 | src/modules/gstreamer/Makefile |
210 | src/modules/vlc/Makefile | ||
211 | src/edje_external/Makefile | 217 | src/edje_external/Makefile |
212 | src/bin/Makefile | 218 | src/bin/Makefile |
213 | data/Makefile | 219 | data/Makefile |
@@ -228,7 +234,7 @@ echo "Configuration Options Summary:" | |||
228 | echo | 234 | echo |
229 | echo " Modules:" | 235 | echo " Modules:" |
230 | echo " Xine...............: ${enable_xine}" | 236 | echo " Xine...............: ${enable_xine}" |
231 | echo " Vlc................: ${enable_vlc}" | 237 | #echo " Vlc................: ${enable_vlc}" |
232 | echo " Gstreamer..........: ${enable_gstreamer}" | 238 | echo " Gstreamer..........: ${enable_gstreamer}" |
233 | echo | 239 | echo |
234 | echo " Build emotion_test...: $have_emotion_test" | 240 | 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 @@ | |||
1 | 1 | ||
2 | MAINTAINERCLEANFILES = Makefile.in | 2 | MAINTAINERCLEANFILES = Makefile.in |
3 | 3 | ||
4 | SUBDIRS = xine gstreamer vlc | 4 | SUBDIRS = xine gstreamer |