From 72cfcf41568d34c8d0ae0e01205ee62bb79f207d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Fri, 3 Sep 2010 21:27:12 +0000 Subject: [PATCH] configure: make print_config() more flexible Originally committed as revision 25037 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 2f9c9b6e22..b92c91fb70 100755 --- a/configure +++ b/configure @@ -495,20 +495,25 @@ check_deps(){ done } +print_config_h(){ + enabled $1 && v=1 || v=0 + echo "#define $2 $v" +} + +print_config_mak(){ + enabled $1 && v= || v=! + echo "$v$2=yes" +} + print_config(){ pfx=$1 - header=$2 - makefile=$3 - shift 3 + files=$2 + shift 2 for cfg; do ucname="$(toupper $cfg)" - if enabled $cfg; then - echo "#define ${pfx}${ucname} 1" >> $header - echo "${pfx}${ucname}=yes" >> $makefile - else - echo "#define ${pfx}${ucname} 0" >> $header - echo "!${pfx}${ucname}=yes" >> $makefile - fi + for f in $files; do + "print_config_${f##*.}" $cfg ${pfx}${ucname} >>$f + done done } @@ -3062,6 +3067,8 @@ fi enabled stripping || strip="echo skipping strip" +config_files="$TMPH config.mak" + cat > config.mak <> $TMPH fi -print_config ARCH_ $TMPH config.mak $ARCH_LIST -print_config HAVE_ $TMPH config.mak $HAVE_LIST -print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \ +print_config ARCH_ "$config_files" $ARCH_LIST +print_config HAVE_ "$config_files" $HAVE_LIST +print_config CONFIG_ "$config_files" $CONFIG_LIST \ $CONFIG_EXTRA \ $DECODER_LIST \ $ENCODER_LIST \ @@ -3214,7 +3221,7 @@ cat > $TMPH <> $TMPH