Commit f6f69c30 authored by Måns Rullgård's avatar Måns Rullgård

handle network dependency on protocols with check_deps()

Originally committed as revision 7931 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 799c9e9b
...@@ -608,6 +608,7 @@ x11_grab_device_demuxer_deps="x11grab" ...@@ -608,6 +608,7 @@ x11_grab_device_demuxer_deps="x11grab"
ffplay_deps="sdl" ffplay_deps="sdl"
ffserver_deps="network protocols muxers" ffserver_deps="network protocols muxers"
network_deps="protocols"
# set temporary file name # set temporary file name
if test ! -z "$TMPDIR" ; then if test ! -z "$TMPDIR" ; then
...@@ -1101,7 +1102,7 @@ for opt do ...@@ -1101,7 +1102,7 @@ for opt do
;; ;;
--disable-mpegaudio-hp) mpegaudio_hp="no" --disable-mpegaudio-hp) mpegaudio_hp="no"
;; ;;
--disable-protocols) protocols="no"; network="no" --disable-protocols) protocols="no"
;; ;;
--disable-ffmpeg) ffmpeg="no" --disable-ffmpeg) ffmpeg="no"
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment