changeset 35276:0f09dd8843bf

Generate proper CONFIG_ entries in config.mak. Fixes compilation with e.g. zlib disabled.
author reimar
date Fri, 09 Nov 2012 21:03:30 +0000
parents 317eee237d0f
children 4e9d5dc30c00
files configure
diffstat 1 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Nov 08 18:26:13 2012 +0000
+++ b/configure	Fri Nov 09 21:03:30 2012 +0000
@@ -8104,6 +8104,8 @@
 for part in $list; do
   if $(echo $item | grep -q -E "(^| )$part($| )"); then
     echo "${nprefix}_$part = yes"
+  else
+    echo "${nprefix}_$part = no"
   fi
 done
 }
@@ -8448,15 +8450,15 @@
 HAVE_W32THREADS = $_w32threads
 HAVE_YASM       = $have_yasm
 
-$(echo $libavdecoders  | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $libavencoders  | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $libavparsers   | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $libavdemuxers  | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $libavmuxers    | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $libavprotocols | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $libavbsfs      | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $libavhwaccels  | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
-$(echo $libavfilters   | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/')
+$(mak_enable "$libavdecoders_all"  "$libavdecoders"  CONFIG)
+$(mak_enable "$libavencoders_all"  "$libavencoders"  CONFIG)
+$(mak_enable "$libavparsers_all"   "$libavparsers"   CONFIG)
+$(mak_enable "$libavdemuxers_all"  "$libavdemuxers"  CONFIG)
+$(mak_enable "$libavmuxers_all"    "$libavmuxers"    CONFIG)
+$(mak_enable "$libavprotocols_all" "$libavprotocols" CONFIG)
+$(mak_enable "$libavbsfs_all"      "$libavbsfs"      CONFIG)
+$(mak_enable "$libavhwaccels_all"  "$libavhwaccels"  CONFIG)
+$(mak_enable "$libavfilters_all"   "$libavfilters"   CONFIG)
 EOF
 
 #############################################################################