build: Disable avconv more completely while leaving the user the option to enable it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/Makefile b/Makefile
index 24fc455f468002f0174c1ca9c5a79756396e9f35..c0af5c2c74e55067f46e8dc516d5b1ca749283a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ include $(SRC_PATH)/common.mak
 FF_EXTRALIBS := $(FFEXTRALIBS)
 FF_DEP_LIBS  := $(DEP_LIBS)
 
-all: $(filter-out avconv, $(PROGS))
+all: $(PROGS)
 
 $(PROGS): %$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
        $(CP) $< $@$(PROGSSUF)

diff --git a/configure b/configure
index cc7ba534df9f1fdede7cc170c2b9a823f163a1b6..50b5c3a369891ebad3b8af0ef7a2077dee62c4cc 100755 (executable)
--- a/configure
+++ b/configure
@@ -81,7 +81,7 @@ Configuration options:
                            and binaries will be unredistributable [no]
   --disable-doc            do not build documentation
   --disable-ffmpeg         disable ffmpeg build
-  --disable-avconv         disable avconv build
+  --enable-avconv          enable  avconv build
   --disable-ffplay         disable ffplay build
   --disable-ffprobe        disable ffprobe build
   --disable-ffserver       disable ffserver build
@@ -1799,7 +1799,6 @@ enable debug
 enable doc
 enable fastdiv
 enable ffmpeg
-enable avconv
 enable ffplay
 enable ffprobe
 enable ffserver