Fixes issue #216 : Cannot build with --without-ffmpeg

2014-07-10 04:09:30 +00:00
parent 3b1270b909
commit 35052f29b4
2 changed files with 3 additions and 0 deletions
@@ -7,6 +7,7 @@ AC_ARG_WITH(static-ffmpeg, AS_HELP_STRING([--with-static-ffmpeg],[Statically lin
 AM_CONDITIONAL(STATIC_FFMPEG, test "$with_static_ffmpeg" = "yes")
 AC_ARG_WITH(system-ffmpeg, AS_HELP_STRING([--with-system-ffmpeg], [Use system instead of bundled ffmpeg (UNSUPPORTED)]), system_ffmpeg=yes, system_ffmpeg=no)
 AM_CONDITIONAL(SYSTEM_FFMPEG, test "$system_ffmpeg" = "yes")
+AM_CONDITIONAL(WITHOUT_FFMPEG, test "$with_ffmpeg" != "yes")

 VIDEO_CFLAGS=
 VIDEO_LIBS=
@@ -1,9 +1,11 @@
+if !WITHOUT_FFMPEG
 if !SYSTEM_FFMPEG
 all-local:
 	cd ffmpeg && $(MAKE) 
 if WINDOWS
 	cp ffmpeg/*/*.dll ..
 endif
+endif

 del-dlls:
 if WINDOWS