[FFmpeg-devel] [PATCH] configure: don't build ffserver unless explicitly enabled

[Timo Rothenpieler]

---
 configure | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index b11ca7f..d67d8a2 100755
--- a/configure
+++ b/configure
@@ -116,7 +116,7 @@ Program options:
   --disable-ffmpeg         disable ffmpeg build
   --disable-ffplay         disable ffplay build
   --disable-ffprobe        disable ffprobe build
-  --disable-ffserver       disable ffserver build
+  --enable-ffserver        enable ffserver build
 
 Documentation options:
   --disable-doc            do not build documentation
@@ -1615,10 +1615,13 @@ LICENSE_LIST="
 PROGRAM_LIST="
     ffplay
     ffprobe
-    ffserver
     ffmpeg
 "
 
+DEPRECATED_PROGRAM_LIST="
+    ffserver
+"
+
 SUBSYSTEM_LIST="
     dct
     dwt
@@ -1644,6 +1647,7 @@ CONFIG_LIST="
     $LICENSE_LIST
     $LIBRARY_LIST
     $PROGRAM_LIST
+    $DEPRECATED_PROGRAM_LIST
     $SUBSYSTEM_LIST
     fontconfig
     incompatible_libav_abi
@@ -6492,7 +6496,7 @@ test -n "$random_seed" &&
 echo
 
 echo "Enabled programs:"
-print_enabled '' $PROGRAM_LIST | print_in_columns
+print_enabled '' $PROGRAM_LIST $DEPRECATED_PROGRAM_LIST | print_in_columns
 echo
 
 echo "External libraries:"
@@ -6682,7 +6686,7 @@ print_program_libs(){
     eval echo "LIBS-${1}=${program_libs}" >> config.mak
 }
 
-map 'print_program_libs $v' $PROGRAM_LIST
+map 'print_program_libs $v' $PROGRAM_LIST $DEPRECATED_PROGRAM_LIST
 
 cat > $TMPH <<EOF
 /* Automatically generated by configure - do not modify! */
-- 
2.9.3