handle network dependency on protocols with check_deps()

[ffmpeg] / configure

diff --git a/configure b/configure
index 1840408d69b1838af3aa8656f642b9f059fd6243..dd1ce1f5d26c4b608ed56023e9d8e1de3cb73872 100755 (executable)
--- a/configure
+++ b/configure
@@ -216,6 +216,25 @@ set_all(){
     done
 }
 
+pushvar(){
+    for var in $*; do
+        eval level=\${${var}_level:=0}
+        eval ${var}_${level}="\$$var"
+        eval ${var}_level=$(($level+1))
+    done
+}
+
+popvar(){
+    for var in $*; do
+        eval level=\${${var}_level:-0}
+        test $level = 0 && continue
+        eval level=$(($level-1))
+        eval $var="\${${var}_${level}}"
+        eval ${var}_level=$level
+        eval unset ${var}_${level}
+    done
+}
+
 enable(){
     set_all yes $*
 }
@@ -258,10 +277,21 @@ disabled_any(){
 
 check_deps(){
     for cfg; do
+        enabled ${cfg}_checking && die "Circular dependency for $cfg."
+        disabled ${cfg}_checking && continue
+        enable ${cfg}_checking
+
         eval dep_all="\$${cfg}_deps"
         eval dep_any="\$${cfg}_deps_any"
+
+        pushvar cfg dep_all dep_any
+        check_deps $dep_all $dep_any
+        popvar cfg dep_all dep_any
+
         enabled_all $dep_all || disable $cfg
         enabled_any $dep_any || disable $cfg
+
+        disable ${cfg}_checking
     done
 }
 
@@ -576,6 +606,10 @@ v4l2_demuxer_deps="video4linux2"
 video_grab_device_demuxer_deps_any="video4linux bktr"
 x11_grab_device_demuxer_deps="x11grab"
 
+ffplay_deps="sdl"
+ffserver_deps="network protocols muxers"
+network_deps="protocols"
+
 # set temporary file name
 if test ! -z "$TMPDIR" ; then
     TMPDIR1="${TMPDIR}"
@@ -956,7 +990,7 @@ for opt do
   ;;
   --cross-prefix=*) cross_prefix="$optval"
   ;;
-  --cross-compile) cross_compile=yes
+  --cross-compile) cross_compile="yes"
   ;;
   --cc=*) cc="$optval"
   ;;
@@ -1000,15 +1034,15 @@ for opt do
   ;;
   --disable-dv1394) dv1394="no"
   ;;
-  --disable-network) network="no"; ffserver="no"
+  --disable-network) network="no"
   ;;
-  --disable-ipv6) ipv6="no";
+  --disable-ipv6) ipv6="no"
   ;;
   --disable-zlib) zlib="no"
   ;;
   --enable-a52) liba52="yes"
   ;;
-  --enable-a52bin) liba52bin="yes"
+  --enable-a52bin) liba52bin="yes";  liba52="yes"
   ;;
   --enable-dts) libdts="yes"
   ;;
@@ -1039,9 +1073,9 @@ for opt do
   ;;
   --enable-x264) x264="yes"
   ;;
-  --enable-avisynth) avisynth="yes";
+  --enable-avisynth) avisynth="yes"
   ;;
-  --enable-x11grab) x11grab="yes";
+  --enable-x11grab) x11grab="yes"
   ;;
   --enable-dc1394) dc1394="yes"
     pkg_requires="$pkg_requires libraw1394"
@@ -1068,7 +1102,7 @@ for opt do
   ;;
   --disable-mpegaudio-hp) mpegaudio_hp="no"
   ;;
-  --disable-protocols) protocols="no"; network="no"; ffserver="no"
+  --disable-protocols) protocols="no"
   ;;
   --disable-ffmpeg) ffmpeg="no"
   ;;
@@ -1120,7 +1154,7 @@ for opt do
   ;;
   --disable-muxer=*) disable ${optval}_muxer
   ;;
-  --disable-muxers) disable $MUXER_LIST; ffserver="no"
+  --disable-muxers) disable $MUXER_LIST
   ;;
   --enable-demuxer=*) enable ${optval}_demuxer
   ;;
@@ -1642,13 +1676,10 @@ enabled audio_beos && add_extralibs "-lmedia -lbe"
 # imlib check
 
 imlib2=no
-if (imlib2-config --version) >/dev/null 2>&1 ; then
+if imlib2-config --version >/dev/null 2>&1; then
     temp_cflags `imlib2-config --cflags`
     temp_extralibs `imlib2-config --libs`
-    check_ld <<EOF && imlib2=yes
-#include <Imlib2.h>
-int main( void ) { return (int) imlib_load_font("foo"); }
-EOF
+    check_lib Imlib2.h imlib_load_font && enable imlib2
     restore_flags
 fi
 
@@ -1656,13 +1687,11 @@ fi
 # FreeType check
 
 freetype2=no
-if test "x$targetos" != "xBeOS"; then
-  if freetype-config --version >/dev/null 2>&1; then
-      temp_cflags `freetype-config --cflags`
-      temp_extralibs `freetype-config --libs`
-      check_lib ft2build.h FT_Init_FreeType && enable freetype2
-      restore_flags
-  fi
+if freetype-config --version >/dev/null 2>&1; then
+    temp_cflags `freetype-config --cflags`
+    temp_extralibs `freetype-config --libs`
+    check_lib ft2build.h FT_Init_FreeType && enable freetype2
+    restore_flags
 fi
 
 ##########################################
@@ -1671,21 +1700,17 @@ fi
 sdl_too_old=no
 sdl=no
 SDL_CONFIG="${cross_prefix}sdl-config"
-if ("${SDL_CONFIG}" --version) >/dev/null 2>&1 ; then
-    temp_cflags `"${SDL_CONFIG}" --cflags`
+if "${SDL_CONFIG}" --version >/dev/null 2>&1; then
+    sdl_cflags=`"${SDL_CONFIG}" --cflags`
+    temp_cflags $sdl_cflags
     temp_extralibs `"${SDL_CONFIG}" --libs`
-    check_ld <<EOF
-#include <SDL.h>
-#undef main /* We don't want SDL to override our main() */
-int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
-EOF
-    if test $? = 0; then
+    if check_lib SDL.h SDL_Init; then
         _sdlversion=`"${SDL_CONFIG}" --version | sed 's/[^0-9]//g'`
         if test "$_sdlversion" -lt 121 ; then
             sdl_too_old=yes
         else
             sdl=yes
-            check_cc <<EOF && sdl_video_size=yes || sdl_video_size=no
+            check_cc $sdl_cflags <<EOF && enable sdl_video_size
 #include <SDL.h>
 int main(void){
     const SDL_VideoInfo *vi = SDL_GetVideoInfo();
@@ -1698,8 +1723,6 @@ EOF
     restore_flags
 fi
 
-enabled sdl || ffplay=no
-
 texi2html -version >/dev/null 2>&1 && enable texi2html || disable texi2html
 
 ##########################################