configure: Fix typo in incdir variable written to config.sh

[ffmpeg] / configure

diff --git a/configure b/configure
index 8e402383d82302fe9803298be4b79159a06ffec8..9cd4fe6b471c36b4de92ca8474c25a175fb63f83 100755 (executable)
--- a/configure
+++ b/configure
@@ -348,6 +348,8 @@ Developer options (useful when working on Libav itself):
   --random-seed=VALUE      seed value for --enable/disable-random
   --disable-valgrind-backtrace do not print a backtrace under Valgrind
                            (only applies to --disable-optimizations builds)
+  --ignore-tests=TESTS     comma-separated list (without "fate-" prefix
+                           in the name) of tests whose result is ignored
 
 NOTE: Object files are built at the place where configure is launched.
 EOF
@@ -1815,6 +1817,7 @@ CMDLINE_SET="
     host_ld
     host_ldflags
     host_os
+    ignore_tests
     ld
     logfile
     malloc_prefix
@@ -5192,6 +5195,13 @@ for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf ind
     echo
 done
 
+if test -n "$ignore_tests"; then
+    ignore_tests=$(echo $ignore_tests | tr ',' ' ')
+    echo "Ignored FATE tests:"
+    echo $ignore_tests | print_3_columns
+    echo
+fi
+
 license="LGPL version 2.1 or later"
 if enabled nonfree; then
     license="nonfree and unredistributable"
@@ -5316,6 +5326,7 @@ SLIB_INSTALL_EXTRA_LIB=${SLIB_INSTALL_EXTRA_LIB}
 SLIB_INSTALL_EXTRA_SHLIB=${SLIB_INSTALL_EXTRA_SHLIB}
 VERSION_SCRIPT_POSTPROCESS_CMD=${VERSION_SCRIPT_POSTPROCESS_CMD}
 SAMPLES:=${samples:-\$(LIBAV_SAMPLES)}
+IGNORE_TESTS=$ignore_tests
 EOF
 
 map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> avbuild/config.mak' $LIBRARY_LIST
@@ -5396,30 +5407,17 @@ print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $
 
 test -n "$WARNINGS" && printf "\n$WARNINGS"
 
-# build pkg-config files
-
-lib_version(){
-    eval printf "\"lib${1} >= \$LIB$(toupper ${1})_VERSION, \""
-}
+# Settings for pkg-config files
 
 cat > avbuild/config.sh <<EOF
 # Automatically generated by configure - do not modify!
 shared=$shared
 prefix=$prefix
 libdir=$libdir
-includedir=$incdir
+incdir=$incdir
 source_path=${source_path}
 LIBPREF=${LIBPREF}
 LIBSUF=${LIBSUF}
-
-requires_avutil="$(map 'lib_version $v' $(echo $avutil_deps))"
-requires_avcodec="$(map 'lib_version $v' $(echo $avcodec_deps))"
-requires_avformat="$(map 'lib_version $v' $(echo $avformat_deps))"
-requires_avdevice="$(map 'lib_version $v' $(echo $avdevice_deps))"
-requires_avfilter="$(map 'lib_version $v' $(echo $avfilter_deps))"
-requires_avresample="$(map 'lib_version $v' $(echo $avresample_deps))"
-requires_swscale="$(map 'lib_version $v' $(echo $swscale_deps))"
-
 extralibs_avutil="$LIBRT $LIBM"
 extralibs_avcodec="$extralibs"
 extralibs_avformat="$extralibs"
@@ -5428,3 +5426,8 @@ extralibs_avfilter="$extralibs"
 extralibs_avresample="$LIBM"
 extralibs_swscale="$LIBM"
 EOF
+
+for lib in $LIBRARY_LIST; do
+    lib_deps="$(eval echo \$${lib}_deps)"
+    echo ${lib}_deps=\"$lib_deps\" >> avbuild/config.sh
+done