lavfi/select: make lavc dependency optional.
[ffmpeg.git] / configure
index 78c1749..c36d1f5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1915,7 +1915,6 @@ pan_filter_deps="swresample"
 removelogo_filter_deps="avcodec avformat swscale"
 scale_filter_deps="swscale"
 smartblur_filter_deps="gpl swscale"
-select_filter_deps="avcodec"
 showspectrum_filter_deps="avcodec"
 super2xsai_filter_deps="gpl"
 tinterlace_filter_deps="gpl"
@@ -2316,6 +2315,7 @@ case "$toolchain" in
         cc_default="c99wrap cl"
         ld_default="c99wrap link"
         nm_default="dumpbin -symbols"
+        ar_default="lib"
     ;;
     ?*)
         die "Unknown toolchain $toolchain"
@@ -2688,6 +2688,17 @@ if [ -z "$CC_DEPFLAGS" ] && [ "$dep_cc" != "$cc" ]; then
     DEPCCFLAGS=$_flags
 fi
 
+if $ar 2>&1 | grep -q Microsoft; then
+    arflags="-nologo"
+    ar_o='-out:$@'
+elif $ar 2>&1 | grep -q 'Texas Instruments'; then
+    arflags="rq"
+    ar_o='$@'
+else
+    arflags="rc"
+    ar_o='$@'
+fi
+
 add_cflags $extra_cflags
 add_cxxflags $extra_cxxflags
 add_asflags $extra_cflags
@@ -4113,6 +4124,8 @@ DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
 YASM=$yasmexe
 DEPYASM=$yasmexe
 AR=$ar
+ARFLAGS=$arflags
+AR_O=$ar_o
 RANLIB=$ranlib
 CP=cp -p
 LN_S=$ln_s
@@ -4362,7 +4375,7 @@ pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPL
 fix_ffmpeg_remote(){
     git_remote_from=$1
     git_remote_to=$2
-    fixme_remote=$(git remote -v | grep $git_remote_from | cut -f 1 | sort | uniq)
+    fixme_remote=$(git --git-dir=$source_path/.git --work-tree=$source_path remote -v | grep $git_remote_from | cut -f 1 | sort | uniq)
     if [ "$fixme_remote" != "" ]; then
         echolog "
 Outdated domain in git config, the official domain for ffmpeg git is since